Download as
Browse Code »

Commit bd32c5c61f6c2ede1ff547c86d5edb7b0c387a94

Authored by perry.werneck@gmail.com
1 parent 4ea2a6a7
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Corrigindo construção das imagems em modo debug para facilitar testes

Showing 1 changed file with 16 additions and 4 deletions   Show diff stats
@@ -76,9 +76,17 @@ src/pw3270/%.png: src/pw3270/pixmaps/%.svg @@ -76,9 +76,17 @@ src/pw3270/%.png: src/pw3270/pixmaps/%.svg
76 ifneq ($(CONVERT),no) 76 ifneq ($(CONVERT),no)
77 @echo " GEN `basename $@`" 77 @echo " GEN `basename $@`"
78 @$(MKDIR) `dirname $@` 78 @$(MKDIR) `dirname $@`
79 - @$(CONVERT) $< --format=png > $@ 79 + @$(CONVERT) --format=png --output=$@ $<
80 endif 80 endif
81 81
  82 +%.png: src/pw3270/pixmaps/%.svg
  83 +ifneq ($(CONVERT),no)
  84 + @echo " GEN `basename $@`"
  85 + @$(MKDIR) `dirname $@`
  86 + @$(CONVERT) --format=png --output=$@ $<
  87 +endif
  88 +
  89 +
82 debian/%.install: src/%/Makefile 90 debian/%.install: src/%/Makefile
83 @$(MAKE) DEBDIR=../../debian -C $(dir $^) ../../$@ 91 @$(MAKE) DEBDIR=../../debian -C $(dir $^) ../../$@
84 92
@@ -127,7 +135,7 @@ debian/lib3270-dev.install: Makefile @@ -127,7 +135,7 @@ debian/lib3270-dev.install: Makefile
127 135
128 #---[ Debug targets ]---------------------------------------------------------- 136 #---[ Debug targets ]----------------------------------------------------------
129 137
130 -Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) 138 +Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
131 139
132 $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) 140 $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
133 @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(DBGLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) 141 @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(DBGLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
@@ -135,7 +143,7 @@ $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Debug/lib/@D @@ -135,7 +143,7 @@ $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Debug/lib/@D
135 $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile 143 $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile
136 @$(MAKE) BINDBG=../../.bin/Debug/lib -C src/lib3270 ../../.bin/Debug/lib/@DLLPREFIX@3270@DLLEXT@ 144 @$(MAKE) BINDBG=../../.bin/Debug/lib -C src/lib3270 ../../.bin/Debug/lib/@DLLPREFIX@3270@DLLEXT@
137 145
138 -run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) 146 +run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png
139 @PATH="$(BINDIR)/Debug/lib:$(PATH)" "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)" 147 @PATH="$(BINDIR)/Debug/lib:$(PATH)" "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)"
140 148
141 memchk: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) 149 memchk: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
@@ -175,7 +183,9 @@ $(TMPDIR)/$(PACKAGE_NAME).pot: $(BINDIR)/pot/pw3270.pot $(BINDIR)/pot/lib3270.po @@ -175,7 +183,9 @@ $(TMPDIR)/$(PACKAGE_NAME).pot: $(BINDIR)/pot/pw3270.pot $(BINDIR)/pot/lib3270.po
175 @$(MKDIR) `dirname $@` 183 @$(MKDIR) `dirname $@`
176 @$(MSGCAT) --sort-output $^ | sed "s&VERSION&$(PACKAGE_VERSION)&;s&CHARSET&UTF-8&;s&PACKAGE&$(PACKAGE_NAME)&g" > $@ 184 @$(MSGCAT) --sort-output $^ | sed "s&VERSION&$(PACKAGE_VERSION)&;s&CHARSET&UTF-8&;s&PACKAGE&$(PACKAGE_NAME)&g" > $@
177 185
178 -$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean src/pw3270/$(PACKAGE_NAME).png src/pw3270/$(PACKAGE_NAME)-logo.png 186 +pixmaps: src/pw3270/$(PACKAGE_NAME).png src/pw3270/$(PACKAGE_NAME)-logo.png
  187 +
  188 +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean pixmaps
179 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 189 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
180 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 190 @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
181 @cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 191 @cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
@@ -232,6 +242,8 @@ clean: @@ -232,6 +242,8 @@ clean:
232 @make -C src/lib3270 clean 242 @make -C src/lib3270 clean
233 @make -C src/pw3270 clean 243 @make -C src/pw3270 clean
234 @make -C src/tools clean 244 @make -C src/tools clean
  245 + @rm -f $(PACKAGE_NAME).png
  246 + @rm -f $(PACKAGE_NAME)-logo.png
235 @rm -f *.log 247 @rm -f *.log
236 248
237 distclean: clean 249 distclean: clean