fdo#70393: move liblangtag to a subdir of external

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

RepositoryModule_build.mk

@@ -87,7 +87,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
 		helpcompiler \
 		xmlhelp \
 	) \
-	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
 	$(call gb_Helper_optional,LIBXML2,libxml2) \
 	$(call gb_Helper_optional,LIBXSLT,libxslt) \
 	$(call gb_Helper_optional,QADEVOOO,qadevOOo) \

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,LIBLANGTAG,liblangtag) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \
 	$(call gb_Helper_optional,MWAW,libmwaw) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \

external/Module_external.mk

@@ -44,6 +44,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,LCMS2,lcms2) \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
 	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
+	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 ))
 

liblangtag/Makefile → external/liblangtag/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:

liblangtag/Module_liblangtag.mk → external/liblangtag/Module_liblangtag.mk

@@ -9,16 +9,11 @@
 
 $(eval $(call gb_Module_Module,liblangtag))
 
-ifeq ($(ENABLE_LIBLANGTAG),TRUE)
-ifeq ($(SYSTEM_LIBLANGTAG),NO)
-
 $(eval $(call gb_Module_add_targets,liblangtag,\
 	UnpackedTarball_langtag \
 	ExternalPackage_langtag_data \
 	ExternalProject_langtag \
 	ExternalPackage_liblangtag_data \
 ))
-endif
-endif
 
 # vim: set noet sw=4 ts=4:

liblangtag/UnpackedTarball_langtag.mk → external/liblangtag/UnpackedTarball_langtag.mk

@@ -12,22 +12,22 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,langtag))
 $(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL),,liblangtag))
 
 $(eval $(call gb_UnpackedTarball_add_patches,langtag,\
-	liblangtag/liblangtag-0.5.1-msvc-warning.patch \
-	liblangtag/liblangtag-0.5.1-vsnprintf.patch \
-	liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch \
-	liblangtag/liblangtag-0.5.1-msvc-snprintf.patch \
-	liblangtag/liblangtag-0.5.1-msvc-strtoull.patch \
-	liblangtag/liblangtag-0.5.1-scope-declaration.patch \
-	liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch \
-	liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch \
-	liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch \
-	liblangtag/liblangtag-0.5.1-unistd.patch \
+	external/liblangtag/liblangtag-0.5.1-msvc-warning.patch \
+	external/liblangtag/liblangtag-0.5.1-vsnprintf.patch \
+	external/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch \
+	external/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch \
+	external/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch \
+	external/liblangtag/liblangtag-0.5.1-scope-declaration.patch \
+	external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch \
+	external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch \
+	external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch \
+	external/liblangtag/liblangtag-0.5.1-unistd.patch \
 ))
 
 ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
 $(eval $(call gb_UnpackedTarball_add_patches,langtag,\
-	liblangtag/liblangtag-0.5.1-mingw.patch \
+	external/liblangtag/liblangtag-0.5.1-mingw.patch \
 ))
 endif
 endif