fdo#70393: move libexttextcat to a subdir of external

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

RepositoryModule_host.mk

@@ -70,7 +70,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	jvmaccess \
 	jvmfwk \
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
-	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
 	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \
 	$(call gb_Helper_optional,MWAW,libmwaw) \

external/Module_external.mk

@@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,JFREEREPORT,jfreereport) \
 	$(call gb_Helper_optional,LCMS2,lcms2) \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
+	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 ))
 

libexttextcat/Makefile → external/libexttextcat/Makefile

@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:

libexttextcat/Module_libexttextcat.mk → external/libexttextcat/Module_libexttextcat.mk

@@ -9,7 +9,6 @@
 
 $(eval $(call gb_Module_Module,libexttextcat))
 
-ifeq ($(SYSTEM_LIBEXTTEXTCAT),NO)
 $(eval $(call gb_Module_add_targets,libexttextcat,\
 	ExternalPackage_fingerprint \
 	UnpackedTarball_exttextcat \
@@ -23,6 +22,5 @@ $(eval $(call gb_Module_add_targets,libexttextcat,\
 	ExternalProject_exttextcat \
 ))
 endif
-endif
 
 # vim: set noet sw=4 ts=4:

libexttextcat/UnpackedTarball_exttextcat.mk → external/libexttextcat/UnpackedTarball_exttextcat.mk

@@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,exttextcat))
 $(eval $(call gb_UnpackedTarball_set_tarball,exttextcat,$(LIBEXTTEXTCAT_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,exttextcat,\
-    libexttextcat/exttextcat-msvc-stdint.patch \
+    external/libexttextcat/exttextcat-msvc-stdint.patch \
 ))
 
 # vim: set noet sw=4 ts=4: