From 19b34f9cd76761ce63f10568bec7816b99beab4a Mon Sep 17 00:00:00 2001
From: perry.werneck@gmail.com <perry.werneck@gmail.com@d25448e0-c022-0410-b998-a785f7053de0>
Date: Mon, 25 Mar 2013 13:49:18 +0000
Subject: [PATCH] Incluindo extensão libre office no Makefile principal

---
 Makefile.in  | 11 +++++++++--
 configure.ac | 41 ++++++++++++++++++++++-------------------
 po/pt_BR.po  |  2 +-
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index b877b28..889db9a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,6 +33,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 
 PLUGINS=@PLUGINS@
+EXTENSIONS=@EXTENSIONS@
 
 #---[ Paths ]------------------------------------------------------------------
 
@@ -143,6 +144,7 @@ $(BINDIR)/Release/plugins/%@DLLEXT@: src/plugins/%/* $(BINDIR)/Release/$(PACKAGE
 all: Release
 
 Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \
+			$(foreach EXT, $(EXTENSIONS), $(EXT)) \
 			locale pixmaps filelist
 
 $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS)
@@ -151,6 +153,11 @@ $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DL
 $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile
 	@$(MAKE) BINRLS=../../.bin/Release@DLLDIR@ -C src/lib3270 ../../.bin/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@
 
+oxt: $(BINDIR)/$(PACKAGE_TARNAME).oxt
+
+$(BINDIR)/$(PACKAGE_TARNAME).oxt: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
+	@$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/oxt ../../.bin/$(PACKAGE_TARNAME).oxt
+
 #---[ File lists ]-------------------------------------------------------------
 
 filelist: debian/lib3270-dev.install debian/lib3270.install debian/lib3270-dev.install debian/pw3270.install \
@@ -270,7 +277,7 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist
 	@rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
 	@echo $@
 
-install: install-sdk install-lib install-app install-man install-plugins
+install: $(foreach EXT, sdk lib app man plugins $(EXTENSIONS), install-$(EXT))
 
 install-app: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) install-locale
 	@$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install
@@ -319,7 +326,7 @@ install-sdk:
 	@$(INSTALL_DATA) src/sample/*.c $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/sample
 
 install-oxt:
-	@make LIB3270_CFLAGS="-I../../src/include" -C src/oxt install
+	@$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/oxt install
 
 clean:
 	@rm -fr .obj
diff --git a/configure.ac b/configure.ac
index a36bed4..cd2cd0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,6 +111,7 @@ DLLPREFIX="lib"
 PLUGINS=""
 APP_GUI_SRC=""
 LDLIBFLAGS=""
+EXTENSIONS=""
 
 if test $host != $build; then
 	AC_CHECK_PROGS(HOST_CC, gcc cc)
@@ -312,25 +313,6 @@ AC_SUBST(JAR)
 AC_SUBST(JAVA_HOME)
 AC_SUBST(JRE_HOME)
 
-#--[ Misc options ]-------------------------------------------------------------------------------------------------------------------------------------------
-
-AC_SUBST(MAJOR_VERSION,"$(echo $VERSION | cut -d. -f1)")
-AC_SUBST(HOST_CC)
-AC_SUBST(EXEEXT)
-AC_SUBST(DLLPREFIX)
-AC_SUBST(DLLEXT)
-AC_SUBST(DLL_FLAGS)
-AC_SUBST(DLL_CFLAGS)
-AC_SUBST(DLLDIR)
-AC_SUBST(LDSOFLAGS)
-AC_SUBST(LDAPPFLAGS)
-AC_SUBST(LDLIBFLAGS)
-AC_SUBST(DBGRPATH)
-AC_SUBST(DBGCMDPREFIX)
-AC_SUBST(LDARCH)
-AC_SUBST(PLUGINS)
-AC_SUBST(APP_GUI_SRC)
-
 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------
 
 AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?]))
@@ -461,6 +443,7 @@ fi
 # Set targets
 if test "$app_cv_office" == "yes" ; then
 	AC_MSG_NOTICE([libreoffice sdk is present.])
+	EXTENSIONS="$EXTENSIONS oxt"
 else
 	AC_MSG_NOTICE([libreoffice sdk is NOT present.])
 fi
@@ -471,6 +454,26 @@ AC_SUBST(OO_SDK_HOME)
 #--[ Pre-reqs ]-----------------------------------------------------------------------------------------------------------------------------------------------
 AC_SUBST(LIB3270_REQUIRES)
 
+#--[ Misc options ]-------------------------------------------------------------------------------------------------------------------------------------------
+
+AC_SUBST(MAJOR_VERSION,"$(echo $VERSION | cut -d. -f1)")
+AC_SUBST(HOST_CC)
+AC_SUBST(EXEEXT)
+AC_SUBST(DLLPREFIX)
+AC_SUBST(DLLEXT)
+AC_SUBST(DLL_FLAGS)
+AC_SUBST(DLL_CFLAGS)
+AC_SUBST(DLLDIR)
+AC_SUBST(LDSOFLAGS)
+AC_SUBST(LDAPPFLAGS)
+AC_SUBST(LDLIBFLAGS)
+AC_SUBST(DBGRPATH)
+AC_SUBST(DBGCMDPREFIX)
+AC_SUBST(LDARCH)
+AC_SUBST(PLUGINS)
+AC_SUBST(EXTENSIONS)
+AC_SUBST(APP_GUI_SRC)
+
 #--[ Output files ]-------------------------------------------------------------------------------------------------------------------------------------------
 
 AC_CONFIG_FILES([
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ffb8a88..1b12d89 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: 2013-03-25 08:38-0300\n"
+"POT-Creation-Date: 2013-03-25 10:47-0300\n"
 "PO-Revision-Date: 2013-03-12 11:29-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português <>\n"
--
libgit2 0.21.2