From bd32c5c61f6c2ede1ff547c86d5edb7b0c387a94 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Thu, 10 May 2012 11:41:31 +0000 Subject: [PATCH] Corrigindo construção das imagems em modo debug para facilitar testes --- Makefile.in | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index dddb759..87a6e0a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -76,9 +76,17 @@ src/pw3270/%.png: src/pw3270/pixmaps/%.svg ifneq ($(CONVERT),no) @echo " GEN `basename $@`" @$(MKDIR) `dirname $@` - @$(CONVERT) $< --format=png > $@ + @$(CONVERT) --format=png --output=$@ $< endif +%.png: src/pw3270/pixmaps/%.svg +ifneq ($(CONVERT),no) + @echo " GEN `basename $@`" + @$(MKDIR) `dirname $@` + @$(CONVERT) --format=png --output=$@ $< +endif + + debian/%.install: src/%/Makefile @$(MAKE) DEBDIR=../../debian -C $(dir $^) ../../$@ @@ -127,7 +135,7 @@ debian/lib3270-dev.install: Makefile #---[ Debug targets ]---------------------------------------------------------- -Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) +Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) @$(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 $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile @$(MAKE) BINDBG=../../.bin/Debug/lib -C src/lib3270 ../../.bin/Debug/lib/@DLLPREFIX@3270@DLLEXT@ -run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) +run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png @PATH="$(BINDIR)/Debug/lib:$(PATH)" "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)" memchk: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) @@ -175,7 +183,9 @@ $(TMPDIR)/$(PACKAGE_NAME).pot: $(BINDIR)/pot/pw3270.pot $(BINDIR)/pot/lib3270.po @$(MKDIR) `dirname $@` @$(MSGCAT) --sort-output $^ | sed "s&VERSION&$(PACKAGE_VERSION)&;s&CHARSET&UTF-8&;s&PACKAGE&$(PACKAGE_NAME)&g" > $@ -$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean src/pw3270/$(PACKAGE_NAME).png src/pw3270/$(PACKAGE_NAME)-logo.png +pixmaps: src/pw3270/$(PACKAGE_NAME).png src/pw3270/$(PACKAGE_NAME)-logo.png + +$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz: clean pixmaps @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) @$(MKDIR) $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) @cp *.m4 $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) @@ -232,6 +242,8 @@ clean: @make -C src/lib3270 clean @make -C src/pw3270 clean @make -C src/tools clean + @rm -f $(PACKAGE_NAME).png + @rm -f $(PACKAGE_NAME)-logo.png @rm -f *.log distclean: clean -- libgit2 0.21.2