fdo#70393: move expat to a subdir of external

Change-Id: I4735c3b10081ac62b4620ff5180f12c30b077627
Reviewed-on: https://gerrit.libreoffice.org/6300Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

RepositoryModule_host.mk

@@ -46,7 +46,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	embeddedobj \
 	embedserv \
 	eventattacher \
-	$(call gb_Helper_optional,EXPAT,expat) \
 	extensions \
 	external \
 	extras \

external/Module_external.mk

@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,CT2N,ct2n) \
 	$(call gb_Helper_optional,CURL,curl) \
 	$(call gb_Helper_optional,EPM,epm) \
+	$(call gb_Helper_optional,EXPAT,expat) \
 	$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 ))

expat/Module_expat.mk → external/expat/Module_expat.mk

@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Module_Module,expat))
 
-ifeq ($(SYSTEM_EXPAT),NO)
-
 $(eval $(call gb_Module_add_targets,expat,\
 	UnpackedTarball_expat \
 	StaticLibrary_expat \
@@ -36,6 +34,4 @@ $(eval $(call gb_Module_add_targets,expat,\
 ))
 endif
 
-endif
-
 # vim: set noet sw=4 ts=4:

expat/UnpackedTarball_expat.mk → external/expat/UnpackedTarball_expat.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,expat))
 $(eval $(call gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,expat,\
-	expat/expat-2.1.0.patch \
+	external/expat/expat-2.1.0.patch \
 ))
 
 # This is a bit hackish.