Download as
Browse Code »

Commit ae27fcfd56d832cac0a63e53bcbbe7c2b25e86eb

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

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
@@ -49,8 +49,8 @@ mandir=@mandir@ @@ -49,8 +49,8 @@ mandir=@mandir@
49 49
50 BINDIR=.bin 50 BINDIR=.bin
51 EXEEXT=@EXEEXT@ 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 TMPDIR=.tmp 54 TMPDIR=.tmp
55 GLOBAL_DEPS=$(PWD)/include/*.h $(PWD)/include/lib3270/*.h 55 GLOBAL_DEPS=$(PWD)/include/*.h $(PWD)/include/lib3270/*.h
56 LANG_FILES=$(wildcard po/*.po) 56 LANG_FILES=$(wildcard po/*.po)
@@ -128,11 +128,11 @@ all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) locale filelist @@ -128,11 +128,11 @@ all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) locale filelist
128 128
129 Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) locale 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 @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) 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 #---[ File lists ]------------------------------------------------------------- 137 #---[ File lists ]-------------------------------------------------------------
138 138
@@ -150,20 +150,20 @@ debian/lib3270-dev.install: Makefile @@ -150,20 +150,20 @@ debian/lib3270-dev.install: Makefile
150 150
151 Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) 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 @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(DBGLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) 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 run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png 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 memchk: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) 162 memchk: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
163 ifeq ($(VALGRIND),no) 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 else 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 endif 167 endif
168 168
169 #---[ Targets ]---------------------------------------------------------------- 169 #---[ Targets ]----------------------------------------------------------------
@@ -240,7 +240,7 @@ install-app: install-locale @@ -240,7 +240,7 @@ install-app: install-locale
240 @$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui 240 @$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
241 241
242 install-lib: 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 locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo) 245 locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo)
246 246
@@ -104,6 +104,7 @@ DLLEXT=".so" @@ -104,6 +104,7 @@ DLLEXT=".so"
104 OBJEXT=".o" 104 OBJEXT=".o"
105 EXEEXT="" 105 EXEEXT=""
106 DLLPREFIX="lib" 106 DLLPREFIX="lib"
  107 +DLLDIR="/lib"
107 108
108 if test $host != $build; then 109 if test $host != $build; then
109 AC_CHECK_PROGS(HOST_CC, gcc cc) 110 AC_CHECK_PROGS(HOST_CC, gcc cc)
@@ -118,6 +119,7 @@ case "$host" in @@ -118,6 +119,7 @@ case "$host" in
118 SOCKET_LIBS="-lws2_32" 119 SOCKET_LIBS="-lws2_32"
119 CFLAGS="$CFLAGS -mms-bitfields" 120 CFLAGS="$CFLAGS -mms-bitfields"
120 DLL_FLAGS="-shared -Wl,-soname,\$(@F)" 121 DLL_FLAGS="-shared -Wl,-soname,\$(@F)"
  122 + DLLDIR=""
121 AC_PATH_TOOL([STRIP], [strip]) 123 AC_PATH_TOOL([STRIP], [strip])
122 ;; 124 ;;
123 125
@@ -229,6 +231,7 @@ AC_SUBST(DLLPREFIX) @@ -229,6 +231,7 @@ AC_SUBST(DLLPREFIX)
229 AC_SUBST(DLLEXT) 231 AC_SUBST(DLLEXT)
230 AC_SUBST(DLL_FLAGS) 232 AC_SUBST(DLL_FLAGS)
231 AC_SUBST(DLL_CFLAGS) 233 AC_SUBST(DLL_CFLAGS)
  234 +AC_SUBST(DLLDIR)
232 235
233 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------ 236 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------
234 237
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 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 "PO-Revision-Date: 2012-08-03 08:52-0300\n" 9 "PO-Revision-Date: 2012-08-03 08:52-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Português do Brasil <>\n" 11 "Language-Team: Português do Brasil <>\n"
src/include/rules.mak.in
  Diff comments   View file @ae27fcf
@@ -62,11 +62,11 @@ TMPDIR ?= $(ROOTDIR)/.tmp @@ -62,11 +62,11 @@ TMPDIR ?= $(ROOTDIR)/.tmp
62 62
63 BINDBG ?= $(BINDIR)/Debug 63 BINDBG ?= $(BINDIR)/Debug
64 BINRLS ?= $(BINDIR)/Release 64 BINRLS ?= $(BINDIR)/Release
65 -LIBDBG ?= $(BINDBG)/lib 65 +LIBDBG ?= $(BINDBG)@DLLDIR@
66 66
67 OBJDBG = $(OBJDIR)/Debug 67 OBJDBG = $(OBJDIR)/Debug
68 OBJRLS = $(OBJDIR)/Release 68 OBJRLS = $(OBJDIR)/Release
69 -LIBRLS ?= $(BINRLS)/lib 69 +LIBRLS ?= $(BINRLS)@DLLDIR@
70 70
71 #---[ Rules ]------------------------------------------------------------------ 71 #---[ Rules ]------------------------------------------------------------------
72 72
src/lib3270/Makefile.in
  Diff comments   View file @ae27fcf
@@ -76,11 +76,11 @@ DEPENDS ?= *.h Makefile @@ -76,11 +76,11 @@ DEPENDS ?= *.h Makefile
76 76
77 BINDBG ?= $(BINDIR)/Debug 77 BINDBG ?= $(BINDIR)/Debug
78 BINRLS ?= $(BINDIR)/Release 78 BINRLS ?= $(BINDIR)/Release
79 -LIBDBG ?= $(BINDIR)/Debug/lib 79 +LIBDBG ?= $(BINDIR)/Debug@DLLDIR@
80 80
81 OBJDBG = $(OBJDIR)/Debug 81 OBJDBG = $(OBJDIR)/Debug
82 OBJRLS = $(OBJDIR)/Release 82 OBJRLS = $(OBJDIR)/Release
83 -LIBRLS = $(OBJDIR)/Release/lib 83 +LIBRLS = $(OBJDIR)/Release@DLLDIR@
84 84
85 #---[ Rules ]------------------------------------------------------------------ 85 #---[ Rules ]------------------------------------------------------------------
86 86
src/pw3270/Makefile.in
  Diff comments   View file @ae27fcf
@@ -107,7 +107,7 @@ install: Release $(PACKAGE_NAME).desktop $(PACKAGE_NAME)-logo.png @@ -107,7 +107,7 @@ install: Release $(PACKAGE_NAME).desktop $(PACKAGE_NAME)-logo.png
107 $(PACKAGE_NAME).desktop 107 $(PACKAGE_NAME).desktop
108 108
109 $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT): $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@ \ 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 @echo " CCLD `basename $@`" 111 @echo " CCLD `basename $@`"
112 @$(MKDIR) `dirname $@` 112 @$(MKDIR) `dirname $@`
113 @$(LD) -o $@ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT)) $(LIBS) $(LIB3270_LIBS) -l$(PACKAGE_TARNAME) 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,10 +126,10 @@ $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@: $(foreach SRC, $(base
126 Debug: $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT) 126 Debug: $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT)
127 127
128 $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT): $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@ \ 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 @echo " CCLD `basename $@`" 130 @echo " CCLD `basename $@`"
131 @$(MKDIR) `dirname $@` 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 $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ 134 $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@
135 @rm -f $@ 135 @rm -f $@