From 2705a1d4d0f20dd46f5e5d040a934579592af44a Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 20 Apr 2016 11:04:36 -0300 Subject: [PATCH] Corrigindo empacotamento standalone do plugin java (Facilita geração em windows). --- src/java/Makefile.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/java/Makefile.in b/src/java/Makefile.in index 09f9efa..6fd43d7 100644 --- a/src/java/Makefile.in +++ b/src/java/Makefile.in @@ -222,6 +222,7 @@ $(BINRLS)@DLLDIR@/@DLLPREFIX@jni3270@DLLEXT@: \ @$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) -Wl,-soname,`basename $@` -o $@ $^ $(CLASS_LIBS) @INTL_LIBS@ $(BINRLS)/plugins/j3270@DLLEXT@: \ + ../../.bin/Release@DLLDIR@/lib3270@DLLEXT@ \ $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/j3270/$(SRC)@OBJEXT@) \ $(CLASS_RELEASE_OBJECTS) @@ -232,9 +233,12 @@ $(BINRLS)/plugins/j3270@DLLEXT@: \ -o $@ $^ \ $(CLASS_LIBS) \ $(PLUGIN_LIBS) \ - -L../../.bin/Release@DLLDIR@ -l3270 -lpw3270 \ + -L../../.bin/Release@DLLDIR@ -l3270 \ -L$(BINRLS)@DLLDIR@ -ljni3270 +../../.bin/Release@DLLDIR@/lib3270@DLLEXT@: + make -C ../.. .bin/Release@DLLDIR@/lib3270@DLLEXT@ + #---[ Debug targets ]---------------------------------------------------------- Debug: $(BINDBG)@DLLDIR@/@DLLPREFIX@jni3270@DLLEXT@ \ @@ -262,7 +266,7 @@ $(BINDBG)/plugins/j3270@DLLEXT@: \ -o $@ $^ \ $(CLASS_LIBS) \ $(PLUGIN_LIBS) \ - -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270 \ + -L../../.bin/Debug@DLLDIR@ -l3270 \ -L$(BINDBG)@DLLDIR@ -ljni3270 run: \ -- libgit2 0.21.2