Download as
Browse Code »

Commit 19b34f9cd76761ce63f10568bec7816b99beab4a

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

Incluindo extensão libre office no Makefile principal

Showing 3 changed files with 32 additions and 22 deletions   Show diff stats
@@ -33,6 +33,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@ @@ -33,6 +33,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
33 PACKAGE_TARNAME=@PACKAGE_TARNAME@ 33 PACKAGE_TARNAME=@PACKAGE_TARNAME@
34 34
35 PLUGINS=@PLUGINS@ 35 PLUGINS=@PLUGINS@
  36 +EXTENSIONS=@EXTENSIONS@
36 37
37 #---[ Paths ]------------------------------------------------------------------ 38 #---[ Paths ]------------------------------------------------------------------
38 39
@@ -143,6 +144,7 @@ $(BINDIR)/Release/plugins/%@DLLEXT@: src/plugins/%/* $(BINDIR)/Release/$(PACKAGE @@ -143,6 +144,7 @@ $(BINDIR)/Release/plugins/%@DLLEXT@: src/plugins/%/* $(BINDIR)/Release/$(PACKAGE
143 all: Release 144 all: Release
144 145
145 Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \ 146 Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) $(foreach PLUGIN, $(PLUGINS), $(BINDIR)/Release/plugins/$(PLUGIN)@DLLEXT@) \
  147 + $(foreach EXT, $(EXTENSIONS), $(EXT)) \
146 locale pixmaps filelist 148 locale pixmaps filelist
147 149
148 $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) 150 $(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 @@ -151,6 +153,11 @@ $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DL
151 $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile 153 $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile
152 @$(MAKE) BINRLS=../../.bin/Release@DLLDIR@ -C src/lib3270 ../../.bin/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ 154 @$(MAKE) BINRLS=../../.bin/Release@DLLDIR@ -C src/lib3270 ../../.bin/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@
153 155
  156 +oxt: $(BINDIR)/$(PACKAGE_TARNAME).oxt
  157 +
  158 +$(BINDIR)/$(PACKAGE_TARNAME).oxt: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT)
  159 + @$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/oxt ../../.bin/$(PACKAGE_TARNAME).oxt
  160 +
154 #---[ File lists ]------------------------------------------------------------- 161 #---[ File lists ]-------------------------------------------------------------
155 162
156 filelist: debian/lib3270-dev.install debian/lib3270.install debian/lib3270-dev.install debian/pw3270.install \ 163 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 @@ -270,7 +277,7 @@ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar: clean pixmaps filelist
270 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION) 277 @rm -fr $(TMPDIR)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
271 @echo $@ 278 @echo $@
272 279
273 -install: install-sdk install-lib install-app install-man install-plugins 280 +install: $(foreach EXT, sdk lib app man plugins $(EXTENSIONS), install-$(EXT))
274 281
275 install-app: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) install-locale 282 install-app: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) install-locale
276 @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install 283 @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 install
@@ -319,7 +326,7 @@ install-sdk: @@ -319,7 +326,7 @@ install-sdk:
319 @$(INSTALL_DATA) src/sample/*.c $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/sample 326 @$(INSTALL_DATA) src/sample/*.c $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/sample
320 327
321 install-oxt: 328 install-oxt:
322 - @make LIB3270_CFLAGS="-I../../src/include" -C src/oxt install 329 + @$(MAKE) BINDIR=../../.bin LIB3270_CFLAGS="-I../../src/include" -C src/oxt install
323 330
324 clean: 331 clean:
325 @rm -fr .obj 332 @rm -fr .obj
@@ -111,6 +111,7 @@ DLLPREFIX="lib" @@ -111,6 +111,7 @@ DLLPREFIX="lib"
111 PLUGINS="" 111 PLUGINS=""
112 APP_GUI_SRC="" 112 APP_GUI_SRC=""
113 LDLIBFLAGS="" 113 LDLIBFLAGS=""
  114 +EXTENSIONS=""
114 115
115 if test $host != $build; then 116 if test $host != $build; then
116 AC_CHECK_PROGS(HOST_CC, gcc cc) 117 AC_CHECK_PROGS(HOST_CC, gcc cc)
@@ -312,25 +313,6 @@ AC_SUBST(JAR) @@ -312,25 +313,6 @@ AC_SUBST(JAR)
312 AC_SUBST(JAVA_HOME) 313 AC_SUBST(JAVA_HOME)
313 AC_SUBST(JRE_HOME) 314 AC_SUBST(JRE_HOME)
314 315
315 -#--[ Misc options ]-------------------------------------------------------------------------------------------------------------------------------------------  
316 -  
317 -AC_SUBST(MAJOR_VERSION,"$(echo $VERSION | cut -d. -f1)")  
318 -AC_SUBST(HOST_CC)  
319 -AC_SUBST(EXEEXT)  
320 -AC_SUBST(DLLPREFIX)  
321 -AC_SUBST(DLLEXT)  
322 -AC_SUBST(DLL_FLAGS)  
323 -AC_SUBST(DLL_CFLAGS)  
324 -AC_SUBST(DLLDIR)  
325 -AC_SUBST(LDSOFLAGS)  
326 -AC_SUBST(LDAPPFLAGS)  
327 -AC_SUBST(LDLIBFLAGS)  
328 -AC_SUBST(DBGRPATH)  
329 -AC_SUBST(DBGCMDPREFIX)  
330 -AC_SUBST(LDARCH)  
331 -AC_SUBST(PLUGINS)  
332 -AC_SUBST(APP_GUI_SRC)  
333 -  
334 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------ 316 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------
335 317
336 AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?])) 318 AC_CHECK_HEADER(malloc.h, AC_DEFINE(HAVE_MALLOC_H,,[do we have malloc.h?]))
@@ -461,6 +443,7 @@ fi @@ -461,6 +443,7 @@ fi
461 # Set targets 443 # Set targets
462 if test "$app_cv_office" == "yes" ; then 444 if test "$app_cv_office" == "yes" ; then
463 AC_MSG_NOTICE([libreoffice sdk is present.]) 445 AC_MSG_NOTICE([libreoffice sdk is present.])
  446 + EXTENSIONS="$EXTENSIONS oxt"
464 else 447 else
465 AC_MSG_NOTICE([libreoffice sdk is NOT present.]) 448 AC_MSG_NOTICE([libreoffice sdk is NOT present.])
466 fi 449 fi
@@ -471,6 +454,26 @@ AC_SUBST(OO_SDK_HOME) @@ -471,6 +454,26 @@ AC_SUBST(OO_SDK_HOME)
471 #--[ Pre-reqs ]----------------------------------------------------------------------------------------------------------------------------------------------- 454 #--[ Pre-reqs ]-----------------------------------------------------------------------------------------------------------------------------------------------
472 AC_SUBST(LIB3270_REQUIRES) 455 AC_SUBST(LIB3270_REQUIRES)
473 456
  457 +#--[ Misc options ]-------------------------------------------------------------------------------------------------------------------------------------------
  458 +
  459 +AC_SUBST(MAJOR_VERSION,"$(echo $VERSION | cut -d. -f1)")
  460 +AC_SUBST(HOST_CC)
  461 +AC_SUBST(EXEEXT)
  462 +AC_SUBST(DLLPREFIX)
  463 +AC_SUBST(DLLEXT)
  464 +AC_SUBST(DLL_FLAGS)
  465 +AC_SUBST(DLL_CFLAGS)
  466 +AC_SUBST(DLLDIR)
  467 +AC_SUBST(LDSOFLAGS)
  468 +AC_SUBST(LDAPPFLAGS)
  469 +AC_SUBST(LDLIBFLAGS)
  470 +AC_SUBST(DBGRPATH)
  471 +AC_SUBST(DBGCMDPREFIX)
  472 +AC_SUBST(LDARCH)
  473 +AC_SUBST(PLUGINS)
  474 +AC_SUBST(EXTENSIONS)
  475 +AC_SUBST(APP_GUI_SRC)
  476 +
474 #--[ Output files ]------------------------------------------------------------------------------------------------------------------------------------------- 477 #--[ Output files ]-------------------------------------------------------------------------------------------------------------------------------------------
475 478
476 AC_CONFIG_FILES([ 479 AC_CONFIG_FILES([
@@ -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: 2013-03-25 08:38-0300\n" 8 +"POT-Creation-Date: 2013-03-25 10:47-0300\n"
9 "PO-Revision-Date: 2013-03-12 11:29-0300\n" 9 "PO-Revision-Date: 2013-03-12 11:29-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 <>\n" 11 "Language-Team: Português <>\n"