From 038c761d326b013b9066c9d073334d69759e0323 Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Thu, 18 Jun 2015 17:37:52 +0000
Subject: [PATCH] Empacotando plugin java

---
 Makefile.in    | 34 ++++++++++++++++++++++------------
 configure.ac   |  3 +++
 po/pt_BR.po    |  2 +-
 pw3270.spec.in |  4 ++++
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 376801a..8972b2c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -148,12 +148,16 @@ $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins/%@DLLEXT@: $(BINDIR)/Release/plugins
 
 #---[ Release targets ]--------------------------------------------------------
 
-all: Release
+all: \
+	$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) \
+	$(foreach EXT, $(EXTENSIONS), $(EXT)) \
+	$(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \
+	locale pixmaps
 
 Release: \
 	$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) \
-	$(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \
 	$(foreach EXT, $(EXTENSIONS), $(EXT)) \
+	$(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \
 	locale pixmaps
 
 $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DLLDIR@/lib3270@DLLEXT@ $(DEPENDS)
@@ -176,14 +180,13 @@ $(BINDIR)/Release/tn3270.so: src/php/*
 	@$(MKDIR) `dirname $@`
 	@cp src/php/.bin/Release/php3270.so $@
 
-java: src/java/Makefile src/java/*.cc src/java/*.h src/java/*.java
-	@$(MAKE) -C src/java Release
+java: $(BINDIR)/Release/@DLLPREFIX@jni3270@DLLEXT@
 
 $(BINDIR)/Release/@DLLPREFIX@jni3270@DLLEXT@: src/java/*
-	@$(MAKE) -C src/java Release
 	@$(MKDIR) `dirname $@`
-	@cp src/java/.bin/Release/*@DLLEXT@ $(BINDIR)/Release
-	@cp src/java/.bin/Release/*.jar $(BINDIR)/Release
+	@$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/java Release
+
+rexx: $(BINDIR)/Debug/plugins/rx3270@DLLEXT@
 
 #---[ Debug targets ]----------------------------------------------------------
 
@@ -314,13 +317,17 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps
 
 install: $(foreach EXT, sdk lib app man plugins $(EXTENSIONS), install-$(EXT))
 
-install-app: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) install-locale
+install-app: \
+	$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) \
+	install-locale
+
 	@$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install
 	@$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
 	@$(INSTALL_DATA) colors.conf $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)
 	@$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui
 
-install-plugins: $(foreach PLUGIN, $(PLUGINS), $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins/$(PLUGIN)@DLLEXT@)
+install-plugins: \
+	$(foreach PLUGIN, $(PLUGINS), $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins/$(PLUGIN)@DLLEXT@)
 
 install-lib: $(BINDIR)/Release@DLLDIR@/lib3270@DLLEXT@
 	@$(MAKE) BINRLS="../../.bin/Release@DLLDIR@" -C src/lib3270 install
@@ -375,11 +382,14 @@ install-php:
 install-java:
 	@$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/java install
 
-install-plugin-rexx:
+install-rexx:
 	@$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/rx3270 install
 
-install-plugin-dbus:
-	@$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/dbus3270 install
+#install-plugin-rexx:
+#	@$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/rx3270 install
+#
+#install-plugin-dbus:
+#	@$(MAKE) BINDIR=../../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/plugins/dbus3270 install
 
 clean:
 	@rm -fr .obj
diff --git a/configure.ac b/configure.ac
index 3df0feb..427d2fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -533,7 +533,10 @@ fi
 if test "$app_cv_rexx" == "yes"; then
 	AC_DEFINE(HAVE_REXX)
 	AC_DEFINE(HAVE_OOREXXAPI_H)
+
 	PLUGINS="$PLUGINS rx3270"
+	EXTENSIONS="$EXTENSIONS rexx"
+
 	AC_MSG_NOTICE([ooRexx plugin & extension are enabled.])
 else
 	AC_MSG_NOTICE([ooRexx is NOT present or disabled.])
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6e63350..eea3d3a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-18 14:06-0300\n"
+"POT-Creation-Date: 2015-06-18 14:22-0300\n"
 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Portugues <>\n"
diff --git a/pw3270.spec.in b/pw3270.spec.in
index cd9ca7b..5309ba8 100644
--- a/pw3270.spec.in
+++ b/pw3270.spec.in
@@ -347,6 +347,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_javadocdir}/%{name}/*
 %{_javadocdir}/%{name}/*
 
+%files -n %{name}-plugin-java
+%{_libdir}/@PACKAGE_NAME@-plugins/j3270.so
+%{_datadir}/pw3270/ui/80java.xml
+
 %endif
 
 
--
libgit2 0.21.2