RepositoryModule_host.mk | 1 external/Module_external.mk | 1 external/xsltml/Makefile | 7 external/xsltml/Module_xsltml.mk | 20 external/xsltml/README | 14 external/xsltml/UnpackedTarball_xsltml.mk | 28 external/xsltml/xsltml_2.1.2.patch | 1713 ++++++++++++++++++++++++++++++ xsltml/Makefile | 7 xsltml/Module_xsltml.mk | 20 xsltml/README | 14 xsltml/UnpackedTarball_xsltml.mk | 28 xsltml/xsltml_2.1.2.patch | 1713 ------------------------------ 12 files changed, 1783 insertions(+), 1783 deletions(-)
New commits: commit b36fb485d468ddf97076e55ad937caa6331298c0 Author: Khaled Hosny <[email protected]> Date: Sun Nov 3 20:45:21 2013 +0200 fdo#70393: move xsltml to a subdir of external Change-Id: I2d244cc2ea9390f3a118bb620d397faa59e4e491 Reviewed-on: https://gerrit.libreoffice.org/6555 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index ccae97c..15394b8 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 d6c1184..1a9f63a 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 similarity index 71% rename from xsltml/Makefile rename to external/xsltml/Makefile index ccb1c85..e4968cf 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 similarity index 100% rename from xsltml/Module_xsltml.mk rename to external/xsltml/Module_xsltml.mk diff --git a/xsltml/README b/external/xsltml/README similarity index 100% rename from xsltml/README rename to external/xsltml/README diff --git a/xsltml/UnpackedTarball_xsltml.mk b/external/xsltml/UnpackedTarball_xsltml.mk similarity index 94% rename from xsltml/UnpackedTarball_xsltml.mk rename to external/xsltml/UnpackedTarball_xsltml.mk index 4151d26..743f2a0 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 similarity index 100% rename from xsltml/xsltml_2.1.2.patch rename to external/xsltml/xsltml_2.1.2.patch _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
