[Libreoffice-commits] core.git: external/Module_external.mk RepositoryModule_build.mk

[David Tardon]

 RepositoryModule_build.mk   |    2 --
 external/Module_external.mk |    6 ++++++
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit c7ce98cc4f98ca9273d734175c330881d510536c
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Oct 19 10:17:12 2013 +0200

    these are in external now
    
    Change-Id: I3d84a202ae0058a8fe8a810f7e7de2522393f417

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 926aca7..d656714 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 ae4580f..c2eb5c3 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: