diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-02-14 10:17:56 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-02-14 10:31:20 +0200 |
| commit | f9890873d448865a268126f8001c25317c3d3bfc (patch) | |
| tree | 1966c7c22fb2c14cd987f1c30bc7db2e74bde1b0 /Module_cross_tail_build.mk | |
| parent | 2b9394f0c009b385756a0c5d75e3c1cd412f7236 (diff) | |
Build DESKTOP stuff for BUILD only if HOST is of type DESKTOP
The helplinker library has grown a dependency on the svt and tl libraries. But
the helpcompiler module is needed to be built for the BUILD platform only if
the HOST platform's BUILD_TYPE includes DESKTOP (or only if its BUILD_TYPE
includes HELP?).
We used to build helpcompiler and some other things for the BUILD platform
depending on whether the BUILD platform's BUILD_TYPE included DESKTOP.
Also, codemaker should surely be built for BUILD unconditionally, ant xmlhelp
presumably not at all.
Change-Id: I3df995ce6b92da4ce9eb35115cf3e8560e06f292
Diffstat (limited to 'Module_cross_tail_build.mk')
| -rw-r--r-- | Module_cross_tail_build.mk | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/Module_cross_tail_build.mk b/Module_cross_tail_build.mk index 2e15516be2d3..b7a077a982dd 100644 --- a/Module_cross_tail_build.mk +++ b/Module_cross_tail_build.mk @@ -31,16 +31,13 @@ $(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) \ - $(call gb_Helper_optional,DESKTOP,codemaker) \ + codemaker \ comphelper \ cosv \ cppu \ cppuhelper \ - $(call gb_Helper_optional,DESKTOP,helpcompiler) \ i18npool \ i18nutil \ idl \ @@ -50,13 +47,10 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ jurt \ jvmaccess \ jvmfwk \ - $(call gb_Helper_optional,DESKTOP,l10ntools) \ - $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ o3tl \ offapi \ officecfg \ oovbaapi \ - $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ registry \ remotebridges \ ridljar \ @@ -69,15 +63,28 @@ $(eval $(call gb_Module_add_moduledirs,cross_tail_build,\ store \ tools \ ucbhelper \ - $(call gb_Helper_optional,UCPP,ucpp) \ udkapi \ udm \ unoil \ unotest \ unotools \ ure \ - xmlhelp \ xmlreader \ + $(call gb_Helper_optional,BOOST,boost) \ + $(call gb_Helper_optional,CLUCENE,clucene) \ + $(call gb_Helper_optional_for_host,DESKTOP, \ + helpcompiler \ + i18nisolang1 \ + l10ntools \ + sot \ + svtools \ + toolkit \ + tools \ + unotools \ + vcl) \ + $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ + $(call gb_Helper_optional,QADEVOOO,qadevOOo) \ + $(call gb_Helper_optional,UCPP,ucpp) \ $(call gb_Helper_optional,ZLIB,zlib) \ )) |