Commit ae27fcfd56d832cac0a63e53bcbbe7c2b25e86eb
1 parent
49e676a6
Exists in
master
and in
5 other branches
Em windows o debug é mais fácil se as DLLs forem geradas no mesmo diretório do executável
Showing
6 changed files
with
23 additions
and
20 deletions
Show diff stats
Makefile.in
| ... | ... | @@ -49,8 +49,8 @@ mandir=@mandir@ |
| 49 | 49 | |
| 50 | 50 | BINDIR=.bin |
| 51 | 51 | EXEEXT=@EXEEXT@ |
| 52 | -DBGLIB=-L../../$(BINDIR)/Debug/lib -l3270 | |
| 53 | -RLSLIB=-L../../$(BINDIR)/Release/lib -l3270 | |
| 52 | +DBGLIB=-L../../$(BINDIR)/Debug@DLLDIR@ -l3270 | |
| 53 | +RLSLIB=-L../../$(BINDIR)/Release@DLLDIR@ -l3270 | |
| 54 | 54 | TMPDIR=.tmp |
| 55 | 55 | GLOBAL_DEPS=$(PWD)/include/*.h $(PWD)/include/lib3270/*.h |
| 56 | 56 | LANG_FILES=$(wildcard po/*.po) |
| ... | ... | @@ -128,11 +128,11 @@ all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) locale filelist |
| 128 | 128 | |
| 129 | 129 | Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) locale |
| 130 | 130 | |
| 131 | -$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) | |
| 131 | +$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) | |
| 132 | 132 | @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) |
| 133 | 133 | |
| 134 | -$(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile | |
| 135 | - @$(MAKE) BINRLS=../../.bin/Release/lib -C src/lib3270 ../../.bin/Release/lib/@DLLPREFIX@3270@DLLEXT@ | |
| 134 | +$(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile | |
| 135 | + @$(MAKE) BINRLS=../../.bin/Release@DLLDIR@ -C src/lib3270 ../../.bin/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ | |
| 136 | 136 | |
| 137 | 137 | #---[ File lists ]------------------------------------------------------------- |
| 138 | 138 | |
| ... | ... | @@ -150,20 +150,20 @@ debian/lib3270-dev.install: Makefile |
| 150 | 150 | |
| 151 | 151 | Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) |
| 152 | 152 | |
| 153 | -$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) | |
| 153 | +$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) | |
| 154 | 154 | @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(DBGLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) |
| 155 | 155 | |
| 156 | -$(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile | |
| 157 | - @$(MAKE) BINDBG=../../.bin/Debug/lib -C src/lib3270 ../../.bin/Debug/lib/@DLLPREFIX@3270@DLLEXT@ | |
| 156 | +$(BINDIR)/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile | |
| 157 | + @$(MAKE) BINDBG=../../.bin/Debug@DLLDIR@ -C src/lib3270 ../../.bin/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ | |
| 158 | 158 | |
| 159 | 159 | run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png |
| 160 | - @PATH="$(BINDIR)/Debug/lib:$(PATH)" "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)" | |
| 160 | + @PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)" | |
| 161 | 161 | |
| 162 | 162 | memchk: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) |
| 163 | 163 | ifeq ($(VALGRIND),no) |
| 164 | - @PATH="$(BINDIR)/Debug/lib:$(PATH)" "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)" | |
| 164 | + @PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)" | |
| 165 | 165 | else |
| 166 | - @PATH="$(BINDIR)/Debug/lib:$(PATH)" G_DEBUG=gc-friendly G_SLICE=always-malloc \$(VALGRIND) --leak-check=full --suppressions=src/pw3270/valgrind.suppression --gen-suppressions=all $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) | |
| 166 | + @PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" G_DEBUG=gc-friendly G_SLICE=always-malloc \$(VALGRIND) --leak-check=full --suppressions=src/pw3270/valgrind.suppression --gen-suppressions=all $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) | |
| 167 | 167 | endif |
| 168 | 168 | |
| 169 | 169 | #---[ Targets ]---------------------------------------------------------------- |
| ... | ... | @@ -240,7 +240,7 @@ install-app: install-locale |
| 240 | 240 | @$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui |
| 241 | 241 | |
| 242 | 242 | install-lib: |
| 243 | - @$(MAKE) BINRLS="../../.bin/Release/lib" -C src/lib3270 install | |
| 243 | + @$(MAKE) BINRLS="../../.bin/Release@DLLDIR@" -C src/lib3270 install | |
| 244 | 244 | |
| 245 | 245 | locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo) |
| 246 | 246 | ... | ... |
configure.ac
| ... | ... | @@ -104,6 +104,7 @@ DLLEXT=".so" |
| 104 | 104 | OBJEXT=".o" |
| 105 | 105 | EXEEXT="" |
| 106 | 106 | DLLPREFIX="lib" |
| 107 | +DLLDIR="/lib" | |
| 107 | 108 | |
| 108 | 109 | if test $host != $build; then |
| 109 | 110 | AC_CHECK_PROGS(HOST_CC, gcc cc) |
| ... | ... | @@ -118,6 +119,7 @@ case "$host" in |
| 118 | 119 | SOCKET_LIBS="-lws2_32" |
| 119 | 120 | CFLAGS="$CFLAGS -mms-bitfields" |
| 120 | 121 | DLL_FLAGS="-shared -Wl,-soname,\$(@F)" |
| 122 | + DLLDIR="" | |
| 121 | 123 | AC_PATH_TOOL([STRIP], [strip]) |
| 122 | 124 | ;; |
| 123 | 125 | |
| ... | ... | @@ -229,6 +231,7 @@ AC_SUBST(DLLPREFIX) |
| 229 | 231 | AC_SUBST(DLLEXT) |
| 230 | 232 | AC_SUBST(DLL_FLAGS) |
| 231 | 233 | AC_SUBST(DLL_CFLAGS) |
| 234 | +AC_SUBST(DLLDIR) | |
| 232 | 235 | |
| 233 | 236 | #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------ |
| 234 | 237 | ... | ... |
po/pt_BR.po
| ... | ... | @@ -5,7 +5,7 @@ msgid "" |
| 5 | 5 | msgstr "" |
| 6 | 6 | "Project-Id-Version: pw3270 5.0\n" |
| 7 | 7 | "Report-Msgid-Bugs-To: \n" |
| 8 | -"POT-Creation-Date: 2012-08-07 10:38-0300\n" | |
| 8 | +"POT-Creation-Date: 2012-08-07 14:57-0300\n" | |
| 9 | 9 | "PO-Revision-Date: 2012-08-03 08:52-0300\n" |
| 10 | 10 | "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" |
| 11 | 11 | "Language-Team: Português do Brasil <>\n" | ... | ... |
src/include/rules.mak.in
| ... | ... | @@ -62,11 +62,11 @@ TMPDIR ?= $(ROOTDIR)/.tmp |
| 62 | 62 | |
| 63 | 63 | BINDBG ?= $(BINDIR)/Debug |
| 64 | 64 | BINRLS ?= $(BINDIR)/Release |
| 65 | -LIBDBG ?= $(BINDBG)/lib | |
| 65 | +LIBDBG ?= $(BINDBG)@DLLDIR@ | |
| 66 | 66 | |
| 67 | 67 | OBJDBG = $(OBJDIR)/Debug |
| 68 | 68 | OBJRLS = $(OBJDIR)/Release |
| 69 | -LIBRLS ?= $(BINRLS)/lib | |
| 69 | +LIBRLS ?= $(BINRLS)@DLLDIR@ | |
| 70 | 70 | |
| 71 | 71 | #---[ Rules ]------------------------------------------------------------------ |
| 72 | 72 | ... | ... |
src/lib3270/Makefile.in
| ... | ... | @@ -76,11 +76,11 @@ DEPENDS ?= *.h Makefile |
| 76 | 76 | |
| 77 | 77 | BINDBG ?= $(BINDIR)/Debug |
| 78 | 78 | BINRLS ?= $(BINDIR)/Release |
| 79 | -LIBDBG ?= $(BINDIR)/Debug/lib | |
| 79 | +LIBDBG ?= $(BINDIR)/Debug@DLLDIR@ | |
| 80 | 80 | |
| 81 | 81 | OBJDBG = $(OBJDIR)/Debug |
| 82 | 82 | OBJRLS = $(OBJDIR)/Release |
| 83 | -LIBRLS = $(OBJDIR)/Release/lib | |
| 83 | +LIBRLS = $(OBJDIR)/Release@DLLDIR@ | |
| 84 | 84 | |
| 85 | 85 | #---[ Rules ]------------------------------------------------------------------ |
| 86 | 86 | ... | ... |
src/pw3270/Makefile.in
| ... | ... | @@ -107,7 +107,7 @@ install: Release $(PACKAGE_NAME).desktop $(PACKAGE_NAME)-logo.png |
| 107 | 107 | $(PACKAGE_NAME).desktop |
| 108 | 108 | |
| 109 | 109 | $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT): $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@ \ |
| 110 | - $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT)) | |
| 110 | + $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT)) | |
| 111 | 111 | @echo " CCLD `basename $@`" |
| 112 | 112 | @$(MKDIR) `dirname $@` |
| 113 | 113 | @$(LD) -o $@ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT)) $(LIBS) $(LIB3270_LIBS) -l$(PACKAGE_TARNAME) |
| ... | ... | @@ -126,10 +126,10 @@ $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@: $(foreach SRC, $(base |
| 126 | 126 | Debug: $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT) |
| 127 | 127 | |
| 128 | 128 | $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT): $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@ \ |
| 129 | - $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) | |
| 129 | + $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) | |
| 130 | 130 | @echo " CCLD `basename $@`" |
| 131 | 131 | @$(MKDIR) `dirname $@` |
| 132 | - @$(LD) -Wl,--rpath,.bin/Debug/lib -o $@ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) $(LIBS) $(LIB3270_LIBS) -l$(PACKAGE_TARNAME) | |
| 132 | + $(LD) -Wl,--rpath,.bin/Debug@DLLDIR@ -o $@ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) $(LIBS) $(LIB3270_LIBS) -l$(PACKAGE_TARNAME) | |
| 133 | 133 | |
| 134 | 134 | $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ |
| 135 | 135 | @rm -f $@ | ... | ... |