Download as
Browse Code »

Commit 21e969d5befaea2ece78b2627855cacb1fab09f9

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

Incluindo opção de configuração para desativar o strip automático de forma que o… 

…s pacotes debug gerados pelo buildsource incluam todos os símbolos
Showing 3 changed files with 16 additions and 11 deletions   Show diff stats
@@ -59,9 +59,6 @@ AC_PROG_INSTALL @@ -59,9 +59,6 @@ AC_PROG_INSTALL
59 AC_PROG_MKDIR_P 59 AC_PROG_MKDIR_P
60 AC_PROG_LN_S 60 AC_PROG_LN_S
61 61
62 -AC_PATH_TOOL([STRIP], [strip])  
63 -AC_SUBST(STRIP)  
64 -  
65 AC_PATH_TOOL([REXXC], [rexxc], [cp]) 62 AC_PATH_TOOL([REXXC], [rexxc], [cp])
66 AC_SUBST(REXXC) 63 AC_SUBST(REXXC)
67 64
@@ -125,7 +122,6 @@ case "$host" in @@ -125,7 +122,6 @@ case "$host" in
125 DLLDIR="" 122 DLLDIR=""
126 DBGCMDPREFIX="" 123 DBGCMDPREFIX=""
127 LDARCH="" 124 LDARCH=""
128 - AC_PATH_TOOL([STRIP], [strip])  
129 ;; 125 ;;
130 126
131 *-apple-*) 127 *-apple-*)
@@ -140,15 +136,13 @@ case "$host" in @@ -140,15 +136,13 @@ case "$host" in
140 ;; 136 ;;
141 137
142 *) 138 *)
143 - DBG_LDFLAGS="-L.bin/Debug/lib"  
144 - RLS_LDFLAGS="-L.bin/Release/lib -Wl,--strip-all" 139 + DLLDIR="/lib"
  140 + DBG_LDFLAGS="-L.bin/Debug/$DLLDIR"
  141 + RLS_LDFLAGS="-L.bin/Release/$DLLDIR"
145 LDARCH="" 142 LDARCH=""
146 LDSOFLAGS="-Wl,-soname,\`basename \$@\`" 143 LDSOFLAGS="-Wl,-soname,\`basename \$@\`"
147 - DLLDIR="/lib"  
148 DBGRPATH="-Wl,--rpath,.bin/Debug/lib" 144 DBGRPATH="-Wl,--rpath,.bin/Debug/lib"
149 DBGCMDPREFIX="PATH=\$(BINDIR)/Debug/lib:\$(PATH)" 145 DBGCMDPREFIX="PATH=\$(BINDIR)/Debug/lib:\$(PATH)"
150 - AC_PATH_TOOL([STRIP], [strip])  
151 -  
152 146
153 esac 147 esac
154 148
@@ -241,6 +235,16 @@ if test "$app_cv_pic" == "yes"; then @@ -241,6 +235,16 @@ if test "$app_cv_pic" == "yes"; then
241 DLL_CFLAGS="$DLL_CFLAGS -fPIC" 235 DLL_CFLAGS="$DLL_CFLAGS -fPIC"
242 fi 236 fi
243 237
  238 +AC_ARG_ENABLE([strip],[AS_HELP_STRING([--disable-strip], [disable stripping of binaries])], [ app_cv_strip="$enableval" ],[ app_cv_strip="yes" ])
  239 +
  240 +if test "$app_cv_pic" == "yes"; then
  241 + AC_PATH_TOOL([STRIP], [strip], true)
  242 + AC_SUBST(STRIP)
  243 +else
  244 + AC_SUBST(STRIP,"true")
  245 +fi
  246 +
  247 +
244 #--[ Check For Java ]----------------------------------------------------------------------------------------------------------------------------------------- 248 #--[ Check For Java ]-----------------------------------------------------------------------------------------------------------------------------------------
245 249
246 AC_ARG_ENABLE([java],[AS_HELP_STRING([--disable-java], [Disable java extension & plugin])],[ app_cv_java="$enableval" ],[ app_cv_java="yes" ]) 250 AC_ARG_ENABLE([java],[AS_HELP_STRING([--disable-java], [Disable java extension & plugin])],[ app_cv_java="$enableval" ],[ app_cv_java="yes" ])
@@ -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-10 14:40-0300\n" 8 +"POT-Creation-Date: 2012-08-13 16:32-0300\n"
9 "PO-Revision-Date: 2012-08-13 12:14-0300\n" 9 "PO-Revision-Date: 2012-08-13 12:14-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/pw3270/Makefile.in
  Diff comments   View file @21e969d
@@ -86,7 +86,6 @@ endif @@ -86,7 +86,6 @@ endif
86 #---[ Release targets ]-------------------------------------------------------- 86 #---[ Release targets ]--------------------------------------------------------
87 87
88 Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) 88 Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
89 - @$(STRIP) $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)  
90 89
91 install: Release $(PACKAGE_NAME).desktop $(PACKAGE_NAME)-logo.png 90 install: Release $(PACKAGE_NAME).desktop $(PACKAGE_NAME)-logo.png
92 @$(MKDIR) $(DESTDIR)$(bindir) 91 @$(MKDIR) $(DESTDIR)$(bindir)
@@ -112,6 +111,7 @@ $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT): $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@D @@ -112,6 +111,7 @@ $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT): $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@D
112 @echo " CCLD `basename $@`" 111 @echo " CCLD `basename $@`"
113 @$(MKDIR) `dirname $@` 112 @$(MKDIR) `dirname $@`
114 @$(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)
  114 + @$(STRIP) $@
115 115
116 $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ 116 $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@
117 @rm -f $@ 117 @rm -f $@
@@ -121,6 +121,7 @@ $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@: $(foreach SRC, $(base @@ -121,6 +121,7 @@ $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@: $(foreach SRC, $(base
121 @echo " CCLD `basename $@`" 121 @echo " CCLD `basename $@`"
122 @$(MKDIR) `dirname $@` 122 @$(MKDIR) `dirname $@`
123 @$(LD) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) 123 @$(LD) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS)
  124 + @$(STRIP) $@
124 125
125 #---[ Debug targets ]---------------------------------------------------------- 126 #---[ Debug targets ]----------------------------------------------------------
126 127