fdo#70393: move libxslt to a subdir of external

Change-Id: Ibf6fd5c32a62752044e70961cf33b05fdcdce104
Reviewed-on: https://gerrit.libreoffice.org/6340Reviewed-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,LIBXSLT,libxslt) \
 	$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
 	$(call gb_Helper_optional,UCPP,ucpp) \
 	$(call gb_Helper_optional,ZLIB,zlib) \

RepositoryModule_host.mk

@@ -72,7 +72,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
 	librelogo \
 	libxmlsec \
-	$(call gb_Helper_optional,LIBXSLT,libxslt) \
 	lingucomponent \
 	linguistic \
 	lotuswordpro \

external/Module_external.mk

@@ -47,6 +47,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 	$(call gb_Helper_optional,LIBXML2,libxml2) \
+	$(call gb_Helper_optional,LIBXSLT,libxslt) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \
 	$(call gb_Helper_optional,MWAW,libmwaw) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \

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

libxslt/Module_libxslt.mk → external/libxslt/Module_libxslt.mk

@@ -9,14 +9,10 @@
 
 $(eval $(call gb_Module_Module,libxslt))
 
-ifeq ($(SYSTEM_LIBXSLT),NO)
-
 $(eval $(call gb_Module_add_targets,libxslt,\
 	ExternalPackage_xslt \
 	ExternalProject_xslt \
 	UnpackedTarball_xslt \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:

libxslt/UnpackedTarball_xslt.mk → external/libxslt/UnpackedTarball_xslt.mk

@@ -12,14 +12,14 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,xslt))
 $(eval $(call gb_UnpackedTarball_set_tarball,xslt,$(LIBXSLT_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,xslt,\
-	libxslt/libxslt-configure.patch \
-	libxslt/libxslt-win_manifest.patch \
-	libxslt/libxslt-mingw.patch \
-	libxslt/libxslt-internal-symbols.patch \
-	libxslt/libxslt-aix.patch \
-	libxslt/libxslt-vc10.patch \
-	libxslt/libxslt-1.1.26-memdump.patch \
-	$(if $(filter ANDROID,$(OS)),libxslt/libxslt-android.patch) \
+	external/libxslt/libxslt-configure.patch \
+	external/libxslt/libxslt-win_manifest.patch \
+	external/libxslt/libxslt-mingw.patch \
+	external/libxslt/libxslt-internal-symbols.patch \
+	external/libxslt/libxslt-aix.patch \
+	external/libxslt/libxslt-vc10.patch \
+	external/libxslt/libxslt-1.1.26-memdump.patch \
+	$(if $(filter ANDROID,$(OS)),external/libxslt/libxslt-android.patch) \
 ))
 
 # vim: set noet sw=4 ts=4: