summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-10-19 10:17:12 +0200
committerDavid Tardon <dtardon@redhat.com>2013-10-19 10:17:12 +0200
commitc7ce98cc4f98ca9273d734175c330881d510536c (patch)
tree4454b78393ee13b3aa7c71621d8ebdc0ee61b861
parent164b3e74e77a220e524fd077e4c6a55a5ea9f0f4 (diff)
these are in external now
Change-Id: I3d84a202ae0058a8fe8a810f7e7de2522393f417
-rw-r--r--RepositoryModule_build.mk2
-rw-r--r--external/Module_external.mk6
2 files changed, 6 insertions, 2 deletions
diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 926aca78ef4b..d6567140ef7a 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -66,8 +66,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
drawinglayer \
editeng \
framework \
- harfbuzz \
- lcms2 \
linguistic \
nss \
package \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index ae4580f79c9c..c2eb5c320f31 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -64,6 +64,12 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \
$(call gb_Helper_optional,WPS,libwps) \
+ $(call gb_Helper_optional_for_host,DESKTOP, \
+ $(if $(filter YES,$(WITH_GALLERY_BUILD)), \
+ harfbuzz \
+ lcms2 \
+ ) \
+ ) \
))
# vim: set noet sw=4 ts=4: