Download as
Browse Code »

Commit ee324b25ffc5ae6fa3bfd2c87e8d70260cc87208

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

Ajustes para empacotamento.

Showing 4 changed files with 7 additions and 33 deletions   Show diff stats
@@ -85,12 +85,6 @@ $(BINDBG)/%@EXEEXT@: \ @@ -85,12 +85,6 @@ $(BINDBG)/%@EXEEXT@: \
85 85
86 @$(MAKE) -C src/$(basename $(notdir $@)) $@ 86 @$(MAKE) -C src/$(basename $(notdir $@)) $@
87 87
88 -$(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \  
89 - $(DEPENDS) \  
90 - ./src/pw3270/*  
91 -  
92 - @$(MAKE) -C src/pw3270 $@  
93 -  
94 $(BINRLS)/%@DLLEXT@: \ 88 $(BINRLS)/%@DLLEXT@: \
95 $(DEPENDS) \ 89 $(DEPENDS) \
96 ./src/%/* 90 ./src/%/*
@@ -151,25 +145,12 @@ $(BINRLS)/%@EXEEXT@: \ @@ -151,25 +145,12 @@ $(BINRLS)/%@EXEEXT@: \
151 145
152 @$(MAKE) -C src/$(basename $(notdir $@)) $@ 146 @$(MAKE) -C src/$(basename $(notdir $@)) $@
153 147
154 -$(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@: \  
155 - $(DEPENDS) \  
156 - ./src/pw3270/*  
157 -  
158 - @$(MAKE) -C src/pw3270 $@  
159 -  
160 -  
161 -$(DESTDIR)$(BINRLS)/%@EXEEXT@: \ 148 +$(DESTDIR)$(bindir)/%@EXEEXT@: \
162 $(DEPENDS) \ 149 $(DEPENDS) \
163 ./src/%/* 150 ./src/%/*
164 151
165 @$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install 152 @$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install
166 153
167 -$(DESTDIR)$(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@: \  
168 - $(DEPENDS) \  
169 - ./src/pw3270/*  
170 -  
171 - @$(MAKE) DESTDIR=$(DESTDIR) -C src/$(basename $(notdir $@)) install  
172 -  
173 $(SRCDIR)/%: \ 154 $(SRCDIR)/%: \
174 %/Makefile 155 %/Makefile
175 156
@@ -225,7 +206,7 @@ install-lib: \ @@ -225,7 +206,7 @@ install-lib: \
225 $(DESTDIR)$(libdir)/lib3270@DLLEXT@ \ 206 $(DESTDIR)$(libdir)/lib3270@DLLEXT@ \
226 207
227 install-app: \ 208 install-app: \
228 - $(DESTDIR)$(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ 209 + $(DESTDIR)$(bindir)/$(PACKAGE_TARNAME)@EXEEXT@ \
229 locale/$(PACKAGE_TARNAME).pot 210 locale/$(PACKAGE_TARNAME).pot
230 211
231 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME) 212 @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
@@ -312,7 +293,7 @@ $(SRCDIR): \ @@ -312,7 +293,7 @@ $(SRCDIR): \
312 293
313 @$(MKDIR) $(SRCDIR)/win 294 @$(MKDIR) $(SRCDIR)/win
314 @$(INSTALL_DATA) \ 295 @$(INSTALL_DATA) \
315 - win/*.in win/*.spec \ 296 + win/*.in \
316 $(SRCDIR)/win 297 $(SRCDIR)/win
317 298
318 @$(INSTALL_PROGRAM) \ 299 @$(INSTALL_PROGRAM) \
locale/pw3270.pot
  Diff comments   View file @ee324b2
@@ -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-24 17:53-0200\n" 12 +"POT-Creation-Date: 2017-01-25 11:42-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-24 17:53-0200\n" 23 +"POT-Creation-Date: 2017-01-25 11:47-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-24 17:53-0200\n" 45 +"POT-Creation-Date: 2017-01-25 11:42-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 @ee324b2
@@ -135,7 +135,7 @@ $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)-plugins/$(MODULE_NAME)@DLLEXT@: \ @@ -135,7 +135,7 @@ $(DESTDIR)$(libdir)/$(PACKAGE_TARNAME)-plugins/$(MODULE_NAME)@DLLEXT@: \
135 135
136 @echo $@ ... 136 @echo $@ ...
137 @$(MKDIR) `dirname $@` 137 @$(MKDIR) `dirname $@`
138 - $(INSTALL_PROGRAM) $(BINRLS)/$(MODULE_NAME)@DLLEXT@ $@ 138 + @$(INSTALL_PROGRAM) $(BINRLS)/$(MODULE_NAME)@DLLEXT@ $@
139 139
140 140
141 $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \ 141 $(BINRLS)/$(MODULE_NAME)@DLLEXT@: \
src/pw3270/Makefile.in
  Diff comments   View file @ee324b2
@@ -156,13 +156,6 @@ $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/%.png: \ @@ -156,13 +156,6 @@ $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/%.png: \
156 @$(SVG2PNG) $< --format=png > $@ 156 @$(SVG2PNG) $< --format=png > $@
157 @$(OPTIPNG) -o7 $@ 157 @$(OPTIPNG) -o7 $@
158 158
159 -$(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/%.png: \  
160 - %.png  
161 -  
162 - @echo $< ...  
163 - @$(MKDIR) `dirname $@`  
164 - @$(OPTIPNG) -out $@ -o7 $<  
165 -  
166 #---[ Release Targets ]------------------------------------------------------------------ 159 #---[ Release Targets ]------------------------------------------------------------------
167 160
168 all: \ 161 all: \