summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-11-03 20:45:21 +0200
committerDavid Tardon <dtardon@redhat.com>2013-11-04 02:53:34 -0600
commitb36fb485d468ddf97076e55ad937caa6331298c0 (patch)
tree67cdaecbccdb001f30b1207d77b9ba4604f3bc24
parent112c60b48463e30e930c0856ebf37461697a0863 (diff)
fdo#70393: move xsltml to a subdir of external
Change-Id: I2d244cc2ea9390f3a118bb620d397faa59e4e491 Reviewed-on: https://gerrit.libreoffice.org/6555 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r--RepositoryModule_host.mk1
-rw-r--r--external/Module_external.mk1
-rw-r--r--external/xsltml/Makefile (renamed from xsltml/Makefile)2
-rw-r--r--external/xsltml/Module_xsltml.mk (renamed from xsltml/Module_xsltml.mk)0
-rw-r--r--external/xsltml/README (renamed from xsltml/README)0
-rw-r--r--external/xsltml/UnpackedTarball_xsltml.mk (renamed from xsltml/UnpackedTarball_xsltml.mk)2
-rw-r--r--external/xsltml/xsltml_2.1.2.patch (renamed from xsltml/xsltml_2.1.2.patch)0
7 files changed, 3 insertions, 3 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index ccae97c2f5cf..15394b828ba8 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -153,7 +153,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
xmlreader \
xmlscript \
xmlsecurity \
- $(call gb_Helper_optional,XSLTML,xsltml) \
$(call gb_Helper_optional,ZLIB,zlib) \
))
diff --git a/external/Module_external.mk b/external/Module_external.mk
index d6c1184bffc8..1a9f63ad0fde 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \
$(call gb_Helper_optional,WPS,libwps) \
+ $(call gb_Helper_optional,XSLTML,xsltml) \
$(call gb_Helper_optional_for_host,DESKTOP, \
$(if $(filter YES,$(WITH_GALLERY_BUILD)), \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
diff --git a/xsltml/Makefile b/external/xsltml/Makefile
index ccb1c85a04da..e4968cf85fb6 100644
--- a/xsltml/Makefile
+++ b/external/xsltml/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/xsltml/Module_xsltml.mk b/external/xsltml/Module_xsltml.mk
index 09877a7e7750..09877a7e7750 100644
--- a/xsltml/Module_xsltml.mk
+++ b/external/xsltml/Module_xsltml.mk
diff --git a/xsltml/README b/external/xsltml/README
index ab22e5e59edc..ab22e5e59edc 100644
--- a/xsltml/README
+++ b/external/xsltml/README
diff --git a/xsltml/UnpackedTarball_xsltml.mk b/external/xsltml/UnpackedTarball_xsltml.mk
index 4151d26f3bef..743f2a01aa0b 100644
--- a/xsltml/UnpackedTarball_xsltml.mk
+++ b/external/xsltml/UnpackedTarball_xsltml.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,xsltml,\
))
$(eval $(call gb_UnpackedTarball_add_patches,xsltml,\
- xsltml/xsltml_2.1.2.patch \
+ external/xsltml/xsltml_2.1.2.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/xsltml/xsltml_2.1.2.patch b/external/xsltml/xsltml_2.1.2.patch
index 292338b210d4..292338b210d4 100644
--- a/xsltml/xsltml_2.1.2.patch
+++ b/external/xsltml/xsltml_2.1.2.patch