Module_cross_tail_build.mk | 31 ++++++++++--------------------- cross_tail_build/prj/build.lst | 2 +- 2 files changed, 11 insertions(+), 22 deletions(-)
New commits: commit 1444a0de4414a6d01a8c23986f58229361c57f84 Author: David Tardon <[email protected]> Date: Sun Nov 18 14:28:42 2012 +0100 add more modules to cross_tail_build Change-Id: Iaae38e666f5d5f9746065111a22a58187970554b diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index faf594e..de8bc75 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ autodoc \ basegfx \ binaryurp \ + $(call gb_Helper_optional,BOOST,boost) \ bridges \ cli_ure \ $(call gb_Helper_optional,CLUCENE,clucene) \ @@ -50,6 +51,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ jvmaccess \ jvmfwk \ $(call gb_Helper_optional,DESKTOP,l10ntools) \ + $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ o3tl \ offapi \ officecfg \ @@ -77,6 +79,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ ure \ xmlhelp \ xmlreader \ + $(call gb_Helper_optional,ZLIB,zlib) \ )) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/cross_tail_build/prj/build.lst b/cross_tail_build/prj/build.lst index ec26db2..8710b08 100644 --- a/cross_tail_build/prj/build.lst +++ b/cross_tail_build/prj/build.lst @@ -1,2 +1,2 @@ -ctb cross_tail_build :: BERKELEYDB:berkeleydb BOOST:boost CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBLANGTAG:liblangtag LIBXML2:libxml2 LIBXSLT:libxslt solenv soltools ZLIB:zlib NULL +ctb cross_tail_build :: BERKELEYDB:berkeleydb CPPUNIT:cppunit EXPAT:expat external ICU:icu LIBXML2:libxml2 LIBXSLT:libxslt solenv soltools NULL ctb tail_build\prj nmake - all ctb_prj NULL commit 133fa98bad1b897f70ef3b99eaa11fbc8f5ed433 Author: David Tardon <[email protected]> Date: Sun Nov 18 13:55:18 2012 +0100 use gb_Helper_optional Change-Id: I9e6b10e2b019ae0805862e29fc934d1ebe3f86f5 diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index 73efb1c..faf594e 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -33,19 +33,13 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ binaryurp \ bridges \ cli_ure \ - $(if $(filter CLUCENE,$(BUILD_TYPE)),\ - clucene \ - ) \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),\ - codemaker \ - ) \ + $(call gb_Helper_optional,CLUCENE,clucene) \ + $(call gb_Helper_optional,DESKTOP,codemaker) \ comphelper \ cosv \ cppu \ cppuhelper \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),\ - helpcompiler \ - ) \ + $(call gb_Helper_optional,DESKTOP,helpcompiler) \ i18npool \ i18nutil \ idl \ @@ -55,16 +49,12 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ jurt \ jvmaccess \ jvmfwk \ - $(if $(filter DESKTOP,$(BUILD_TYPE)),\ - l10ntools \ - ) \ + $(call gb_Helper_optional,DESKTOP,l10ntools) \ o3tl \ offapi \ officecfg \ oovbaapi \ - $(if $(filter QADEVOOO,$(BUILD_TYPE)),\ - qadevOOo \ - ) \ + $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ registry \ remotebridges \ ridljar \ @@ -76,13 +66,9 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ stoc \ store \ tools \ - $(if $(filter TRANSLATIONS,$(BUILD_TYPE)),\ - translations \ - ) \ + $(call gb_Helper_optional,TRANSLATIONS,translations) \ ucbhelper \ - $(if $(filter UCPP,$(BUILD_TYPE)),\ - ucpp \ - ) \ + $(call gb_Helper_optional,UCPP,ucpp) \ udkapi \ udm \ unoil \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
