Download as
Browse Code »

Commit 9909320d0f13400305c461c05ac8df5628880bec

Authored by Perry Werneck
1 parent e3108b0c
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Simplificando geração do módulo java.

Showing 2 changed files with 16 additions and 9 deletions   Show diff stats
@@ -207,11 +207,17 @@ AC_CONFIG_FILES(src/plugins/hllapi/Makefile) @@ -207,11 +207,17 @@ AC_CONFIG_FILES(src/plugins/hllapi/Makefile)
207 207
208 #--[ lib3270 defines ]---------------------------------------------------------------------------------------------------------------------------------------- 208 #--[ lib3270 defines ]----------------------------------------------------------------------------------------------------------------------------------------
209 209
210 -LIB3270_CFLAGS=-I$ac_pwd/src/include  
211 -PW3270_CFLAGS=-I$ac_pwd/src/pw3270/include 210 +LIB3270_CFLAGS="-I$ac_pwd/src/include"
  211 +LIB3270_LIBS="-L$ac_pwd/.bin/Debug$DLLDIR -l3270"
  212 +
  213 +PW3270_CFLAGS="-I$ac_pwd/src/pw3270/include -I$ac_pwd/src/include"
  214 +PW3270_LIBS="-L$ac_pwd/.bin/Debug$DLLDIR -lpw3270"
212 215
213 AC_SUBST(LIB3270_CFLAGS) 216 AC_SUBST(LIB3270_CFLAGS)
  217 +AC_SUBST(LIB3270_LIBS)
  218 +
214 AC_SUBST(PW3270_CFLAGS) 219 AC_SUBST(PW3270_CFLAGS)
  220 +AC_SUBST(PW3270_LIBS)
215 221
216 #--[ Check gettext ]------------------------------------------------------------------------------------------------------------------------------------------ 222 #--[ Check gettext ]------------------------------------------------------------------------------------------------------------------------------------------
217 223
src/java/Makefile.in
  Diff comments   View file @9909320
@@ -77,14 +77,17 @@ include $(CLASSLIBDIR)/class.mak @@ -77,14 +77,17 @@ include $(CLASSLIBDIR)/class.mak
77 77
78 #---[ Build options ]---------------------------------------------------------- 78 #---[ Build options ]----------------------------------------------------------
79 79
80 -CXXFLAGS=@CFLAGS@ @CXXFLAGS@ @DLL_CFLAGS@ @JNI_CPPFLAGS@ -I../include  
81 -  
82 -PW3270_LIBS ?= -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270 80 +LIB3270_LIBS=@LIB3270_LIBS@
  81 +PW3270_LIBS=@PW3270_LIBS@
83 82
84 PLUGIN_CFLAGS=@CXXFLAGS@ -DPW3270_PLUGIN -Wno-deprecated-declarations @DLL_CFLAGS@ @JNI_CPPFLAGS@ -DJNIDIR="\"$(jnidir)\"" \ 83 PLUGIN_CFLAGS=@CXXFLAGS@ -DPW3270_PLUGIN -Wno-deprecated-declarations @DLL_CFLAGS@ @JNI_CPPFLAGS@ -DJNIDIR="\"$(jnidir)\"" \
85 - -DJARDIR="\"$(jvmjardir)\"" @GTK_CFLAGS@ @GTKMAC_CFLAGS@ @PW3270_CFLAGS@ @LIB3270_CFLAGS@ 84 + -DJARDIR="\"$(jvmjardir)\"" @GTK_CFLAGS@ @GTKMAC_CFLAGS@ \
  85 + @PW3270_CFLAGS@ @LIB3270_CFLAGS@
  86 +
  87 +CXXFLAGS=@CFLAGS@ @CXXFLAGS@ @DLL_CFLAGS@ @JNI_CPPFLAGS@ @PW3270_CFLAGS@
  88 +
86 89
87 -PLUGIN_LIBS=@GTK_LIBS@ @GTKMAC_LIBS@ @INTL_LIBS@ @JVM_LIBS@ 90 +PLUGIN_LIBS=@GTK_LIBS@ @GTKMAC_LIBS@ @INTL_LIBS@ @JVM_LIBS@ @PW3270_LIBS@ @LIB3270_LIBS@
88 91
89 #---[ Rules ]------------------------------------------------------------------ 92 #---[ Rules ]------------------------------------------------------------------
90 93
@@ -231,7 +234,6 @@ $(BINRLS)/plugins/j3270@DLLEXT@: \ @@ -231,7 +234,6 @@ $(BINRLS)/plugins/j3270@DLLEXT@: \
231 -o $@ $^ \ 234 -o $@ $^ \
232 $(CLASS_LIBS) \ 235 $(CLASS_LIBS) \
233 $(PLUGIN_LIBS) \ 236 $(PLUGIN_LIBS) \
234 - -L../../.bin/Release@DLLDIR@ -l3270 -lpw3270\  
235 -L$(BINRLS)@DLLDIR@ -ljni3270 237 -L$(BINRLS)@DLLDIR@ -ljni3270
236 238
237 ../../.bin/Release@DLLDIR@/lib3270@DLLEXT@: 239 ../../.bin/Release@DLLDIR@/lib3270@DLLEXT@:
@@ -264,7 +266,6 @@ $(BINDBG)/plugins/j3270@DLLEXT@: \ @@ -264,7 +266,6 @@ $(BINDBG)/plugins/j3270@DLLEXT@: \
264 -o $@ $^ \ 266 -o $@ $^ \
265 $(CLASS_LIBS) \ 267 $(CLASS_LIBS) \
266 $(PLUGIN_LIBS) \ 268 $(PLUGIN_LIBS) \
267 - -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270 \  
268 -L$(BINDBG)@DLLDIR@ -ljni3270 269 -L$(BINDBG)@DLLDIR@ -ljni3270
269 270
270 run: \ 271 run: \