Kaydet (Commit) f9890873 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst 2b9394f0
......@@ -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) \
))
......
......@@ -12445,6 +12445,10 @@ AC_CONFIG_HEADERS([config_host/config_vclplug.h])
AC_CONFIG_HEADERS([config_host/config_version.h])
AC_OUTPUT
if test "$CROSS_COMPILING" = YES; then
(echo; echo export BUILD_TYPE_FOR_HOST=$BUILD_TYPE) >>config_build.mk
fi
# touch the config timestamp file
if test ! -f config_host.mk.stamp; then
echo > config_host.mk.stamp
......
......@@ -216,4 +216,8 @@ define gb_Helper_optional
$(if $(filter $(1),$(BUILD_TYPE)),$(2))
endef
define gb_Helper_optional_for_host
$(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2))
endef
# vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment