fdo#70393: move harfbuzz to a subdir of external

Change-Id: I3eaa6d95aaa1753822e20d21f90f39cadb939332
Reviewed-on: https://gerrit.libreoffice.org/6276Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>

RepositoryModule_host.mk

@@ -71,7 +71,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	framework \
 	$(call gb_Helper_optional,FREETYPE,freetype) \
 	$(call gb_Helper_optional,GRAPHITE,graphite) \
-	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
 	$(call gb_Helper_optional,DESKTOP,helpcompiler) \
 	$(call gb_Helper_optional,HELP,helpcontent2) \
 	$(call gb_Helper_optional,HSQLDB,hsqldb) \

external/Module_external.mk

@@ -17,7 +17,9 @@ ifeq ($(COM),MSC)
 $(eval $(call gb_Module_add_moduledir,external,msc-externals))
 endif
 
-$(call gb_Helper_optional,LIBPNG,\
-    $(eval $(call gb_Module_add_moduledir,external,libpng)))
+$(eval $(call gb_Module_add_moduledirs,external,\
+	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
+	$(call gb_Helper_optional,LIBPNG,libpng) \
+))
 
 # vim: set noet sw=4 ts=4:

harfbuzz/Module_harfbuzz.mk → external/harfbuzz/Module_harfbuzz.mk

@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,harfbuzz))
 
-ifeq ($(ENABLE_HARFBUZZ)-$(SYSTEM_HARFBUZZ),TRUE-NO)
-
 $(eval $(call gb_Module_add_targets,harfbuzz,\
 	ExternalProject_harfbuzz \
 	UnpackedTarball_harfbuzz \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4: