Download as
Browse Code »

Commit 0e4b8d438139a092c2e95a4dcd219bdb78ab3cfe

Authored by Perry Werneck
1 parent c535e22d
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Atualizando plugin dbus.

Showing 3 changed files with 23 additions and 6 deletions   Show diff stats
@@ -120,6 +120,11 @@ $(DESTDIR)$(libdir)/%@DLLEXT@: \ @@ -120,6 +120,11 @@ $(DESTDIR)$(libdir)/%@DLLEXT@: \
120 120
121 @$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install 121 @$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install
122 122
  123 +$(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)-plugins/%@DLLEXT@: \
  124 + $(DEPENDS) \
  125 + ./src/plugins/%/*
  126 +
  127 + @$(MAKE) -C src/plugins/$(basename $(notdir $@)) $@
123 128
124 $(BINRLS)/%@EXEEXT@: \ 129 $(BINRLS)/%@EXEEXT@: \
125 $(DEPENDS) \ 130 $(DEPENDS) \
@@ -173,7 +178,6 @@ locale/$(PACKAGE_TARNAME).pot: \ @@ -173,7 +178,6 @@ locale/$(PACKAGE_TARNAME).pot: \
173 $(POTDIR)/ui.pot \ 178 $(POTDIR)/ui.pot \
174 $(foreach PLG, $(PLUGINS), $(POTDIR)/plugins/$(PLG).pot) 179 $(foreach PLG, $(PLUGINS), $(POTDIR)/plugins/$(PLG).pot)
175 180
176 -  
177 @rm -f $@ 181 @rm -f $@
178 @mkdir -p `dirname $@` 182 @mkdir -p `dirname $@`
179 @$(MSGCAT) --sort-output $^ > $@ 183 @$(MSGCAT) --sort-output $^ > $@
@@ -181,6 +185,7 @@ locale/$(PACKAGE_TARNAME).pot: \ @@ -181,6 +185,7 @@ locale/$(PACKAGE_TARNAME).pot: \
181 install: \ 185 install: \
182 $(DESTDIR)$(libdir)/lib3270@DLLEXT@ \ 186 $(DESTDIR)$(libdir)/lib3270@DLLEXT@ \
183 $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)@EXEEXT@ \ 187 $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)@EXEEXT@ \
  188 + $(foreach PLG, $(PLUGINS), $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)-plugins/$(PLG)@DLLEXT@) \
184 locale/$(PACKAGE_TARNAME).pot 189 locale/$(PACKAGE_TARNAME).pot
185 190
186 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME) 191 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
@@ -250,7 +255,9 @@ $(SRCDIR): \ @@ -250,7 +255,9 @@ $(SRCDIR): \
250 $(SRCDIR)/ui \ 255 $(SRCDIR)/ui \
251 $(SRCDIR)/src/lib3270 \ 256 $(SRCDIR)/src/lib3270 \
252 $(SRCDIR)/src/pw3270 \ 257 $(SRCDIR)/src/pw3270 \
253 - $(SRCDIR)/sdk 258 + $(SRCDIR)/sdk \
  259 + $(SRCDIR)/src/plugins/dbus3270
  260 +
254 261
255 @$(MKDIR) $(SRCDIR) 262 @$(MKDIR) $(SRCDIR)
256 @$(INSTALL_DATA) \ 263 @$(INSTALL_DATA) \
locale/pw3270.pot
  Diff comments   View file @0e4b8d4
@@ -9,7 +9,7 @@ msgstr "" @@ -9,7 +9,7 @@ msgstr ""
9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 9 "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 "Project-Id-Version: PACKAGE VERSION\n" 10 "Project-Id-Version: PACKAGE VERSION\n"
11 "Report-Msgid-Bugs-To: \n" 11 "Report-Msgid-Bugs-To: \n"
12 -"POT-Creation-Date: 2017-01-19 10:13-0200\n" 12 +"POT-Creation-Date: 2017-01-19 10:28-0200\n"
13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 "Language-Team: LANGUAGE <LL@li.org>\n" 15 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +20,7 @@ msgstr &quot;&quot; @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 20 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
21 "Project-Id-Version: PACKAGE VERSION\n" 21 "Project-Id-Version: PACKAGE VERSION\n"
22 "Report-Msgid-Bugs-To: \n" 22 "Report-Msgid-Bugs-To: \n"
23 -"POT-Creation-Date: 2017-01-19 10:13-0200\n" 23 +"POT-Creation-Date: 2017-01-19 10:28-0200\n"
24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 24 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 25 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26 "Language-Team: LANGUAGE <LL@li.org>\n" 26 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -42,7 +42,7 @@ msgstr &quot;&quot; @@ -42,7 +42,7 @@ msgstr &quot;&quot;
42 "#-#-#-#-# dbus3270.pot (PACKAGE VERSION) #-#-#-#-#\n" 42 "#-#-#-#-# dbus3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
43 "Project-Id-Version: PACKAGE VERSION\n" 43 "Project-Id-Version: PACKAGE VERSION\n"
44 "Report-Msgid-Bugs-To: \n" 44 "Report-Msgid-Bugs-To: \n"
45 -"POT-Creation-Date: 2017-01-19 10:13-0200\n" 45 +"POT-Creation-Date: 2017-01-19 10:28-0200\n"
46 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 46 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
47 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 47 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
48 "Language-Team: LANGUAGE <LL@li.org>\n" 48 "Language-Team: LANGUAGE <LL@li.org>\n"
src/plugins/dbus3270/Makefile.in
  Diff comments   View file @0e4b8d4
@@ -133,6 +133,16 @@ $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \ @@ -133,6 +133,16 @@ $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \
133 -o $@ $^ \ 133 -o $@ $^ \
134 $(LIBS) 134 $(LIBS)
135 135
  136 +$(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)-plugins/$(MODULE_NAME)@DLLEXT@: \
  137 + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
  138 +
  139 + @echo $@ ...
  140 + @$(MKDIR) `dirname $@`
  141 + @$(LD) \
  142 + -shared \
  143 + -L$(BASEDIR)/.bin/Release \
  144 + -o $@ $^ \
  145 + $(LIBS)
136 146
137 pot: \ 147 pot: \
138 $(BASEDIR)/.pot/plugins/$(MODULE_NAME).pot 148 $(BASEDIR)/.pot/plugins/$(MODULE_NAME).pot
@@ -148,7 +158,7 @@ $(SRCDIR): \ @@ -148,7 +158,7 @@ $(SRCDIR): \
148 clean 158 clean
149 159
150 @$(MKDIR) $@ 160 @$(MKDIR) $@
151 - @$(INSTALL_DATA) *.c *.h *.xml *.cbp $@ 161 + @$(INSTALL_DATA) *.c *.h *.in *.xml *.cbp $@
152 162
153 163
154 #---[ Debug Targets ]-------------------------------------------------------------------- 164 #---[ Debug Targets ]--------------------------------------------------------------------