Sat Oct 19 00:42:03 PDT 2013

RepositoryModule_build.mk                       |    1 
 RepositoryModule_host.mk                        |    1 
 external/Module_external.mk                     |    1 
 external/libxslt/ExternalPackage_xslt.mk        |   53 ++++++++++++
 external/libxslt/ExternalProject_xslt.mk        |   57 +++++++++++++
 external/libxslt/Makefile                       |    7 +
 external/libxslt/Module_libxslt.mk              |   18 ++++
 external/libxslt/README                         |    1 
 external/libxslt/UnpackedTarball_xslt.mk        |   25 ++++++
 external/libxslt/libxslt-1.1.26-memdump.patch   |   10 ++
 external/libxslt/libxslt-aix.patch              |   21 +++++
 external/libxslt/libxslt-android.patch          |   15 +++
 external/libxslt/libxslt-configure.patch        |   99 ++++++++++++++++++++++++
 external/libxslt/libxslt-internal-symbols.patch |   66 ++++++++++++++++
 external/libxslt/libxslt-mingw.patch            |   36 ++++++++
 external/libxslt/libxslt-vc10.patch             |   23 +++++
 external/libxslt/libxslt-win_manifest.patch     |   11 ++
 libxslt/ExternalPackage_xslt.mk                 |   53 ------------
 libxslt/ExternalProject_xslt.mk                 |   57 -------------
 libxslt/Makefile                                |    7 -
 libxslt/Module_libxslt.mk                       |   22 -----
 libxslt/README                                  |    1 
 libxslt/UnpackedTarball_xslt.mk                 |   25 ------
 libxslt/libxslt-1.1.26-memdump.patch            |   10 --
 libxslt/libxslt-aix.patch                       |   21 -----
 libxslt/libxslt-android.patch                   |   15 ---
 libxslt/libxslt-configure.patch                 |   99 ------------------------
 libxslt/libxslt-internal-symbols.patch          |   66 ----------------
 libxslt/libxslt-mingw.patch                     |   36 --------
 libxslt/libxslt-vc10.patch                      |   23 -----
 libxslt/libxslt-win_manifest.patch              |   11 --
 31 files changed, 443 insertions(+), 448 deletions(-)

New commits:
commit 8d46e3968cf68b6ef6a370084b4cc37dbdda1708
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Oct 18 22:27:30 2013 +0200

    fdo#70393: move libxslt to a subdir of external
    
    Change-Id: Ibf6fd5c32a62752044e70961cf33b05fdcdce104
    Reviewed-on: https://gerrit.libreoffice.org/6340
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 520f186..926aca7 100644
--- a/RepositoryModule_build.mk
+++ b/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) \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index a23db02..2d3be85 100644
--- a/RepositoryModule_host.mk
+++ b/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 \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 378e1ac..ec88b2d 100644
--- a/external/Module_external.mk
+++ b/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) \
diff --git a/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk
similarity index 100%
rename from libxslt/ExternalPackage_xslt.mk
rename to external/libxslt/ExternalPackage_xslt.mk
diff --git a/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk
similarity index 100%
rename from libxslt/ExternalProject_xslt.mk
rename to external/libxslt/ExternalProject_xslt.mk
diff --git a/libxslt/Makefile b/external/libxslt/Makefile
similarity index 71%
rename from libxslt/Makefile
rename to external/libxslt/Makefile
index ccb1c85..e4968cf 100644
--- a/libxslt/Makefile
+++ b/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:
diff --git a/libxslt/Module_libxslt.mk b/external/libxslt/Module_libxslt.mk
similarity index 93%
rename from libxslt/Module_libxslt.mk
rename to external/libxslt/Module_libxslt.mk
index b43a224..6a88fe2 100644
--- a/libxslt/Module_libxslt.mk
+++ b/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:
diff --git a/libxslt/README b/external/libxslt/README
similarity index 100%
rename from libxslt/README
rename to external/libxslt/README
diff --git a/libxslt/UnpackedTarball_xslt.mk b/external/libxslt/UnpackedTarball_xslt.mk
similarity index 58%
rename from libxslt/UnpackedTarball_xslt.mk
rename to external/libxslt/UnpackedTarball_xslt.mk
index dad41d8..b6b20b5 100644
--- a/libxslt/UnpackedTarball_xslt.mk
+++ b/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:
diff --git a/libxslt/libxslt-1.1.26-memdump.patch b/external/libxslt/libxslt-1.1.26-memdump.patch
similarity index 100%
rename from libxslt/libxslt-1.1.26-memdump.patch
rename to external/libxslt/libxslt-1.1.26-memdump.patch
diff --git a/libxslt/libxslt-aix.patch b/external/libxslt/libxslt-aix.patch
similarity index 100%
rename from libxslt/libxslt-aix.patch
rename to external/libxslt/libxslt-aix.patch
diff --git a/libxslt/libxslt-android.patch b/external/libxslt/libxslt-android.patch
similarity index 100%
rename from libxslt/libxslt-android.patch
rename to external/libxslt/libxslt-android.patch
diff --git a/libxslt/libxslt-configure.patch b/external/libxslt/libxslt-configure.patch
similarity index 100%
rename from libxslt/libxslt-configure.patch
rename to external/libxslt/libxslt-configure.patch
diff --git a/libxslt/libxslt-internal-symbols.patch b/external/libxslt/libxslt-internal-symbols.patch
similarity index 100%
rename from libxslt/libxslt-internal-symbols.patch
rename to external/libxslt/libxslt-internal-symbols.patch
diff --git a/libxslt/libxslt-mingw.patch b/external/libxslt/libxslt-mingw.patch
similarity index 100%
rename from libxslt/libxslt-mingw.patch
rename to external/libxslt/libxslt-mingw.patch
diff --git a/libxslt/libxslt-vc10.patch b/external/libxslt/libxslt-vc10.patch
similarity index 100%
rename from libxslt/libxslt-vc10.patch
rename to external/libxslt/libxslt-vc10.patch
diff --git a/libxslt/libxslt-win_manifest.patch b/external/libxslt/libxslt-win_manifest.patch
similarity index 100%
rename from libxslt/libxslt-win_manifest.patch
rename to external/libxslt/libxslt-win_manifest.patch
