RepositoryModule_host.mk | 1 external/Module_external.mk | 1 external/libwpg/ExternalProject_libwpg.mk | 38 ++++++++++++++++++++++++++++++ external/libwpg/Makefile | 7 +++++ external/libwpg/Module_libwpg.mk | 17 +++++++++++++ external/libwpg/README | 1 external/libwpg/UnpackedTarball_libwpg.mk | 21 ++++++++++++++++ libwpg/ExternalProject_libwpg.mk | 38 ------------------------------ libwpg/Makefile | 7 ----- libwpg/Module_libwpg.mk | 21 ---------------- libwpg/README | 1 libwpg/UnpackedTarball_libwpg.mk | 21 ---------------- 12 files changed, 85 insertions(+), 89 deletions(-)
New commits: commit 06c6846346e945f40ce4ab87261e9511d5e87e9c Author: Khaled Hosny <[email protected]> Date: Fri Oct 18 22:21:12 2013 +0200 fdo#70393: move libwpg to a subdir of external Change-Id: I28c0a18f9e85ca913a29f85e647a547cde2d40a1 Reviewed-on: https://gerrit.libreoffice.org/6337 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index b58e73e..f89f6b3 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -71,7 +71,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ jvmfwk \ $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ librelogo \ - $(call gb_Helper_optional,WPG,libwpg) \ $(call gb_Helper_optional,WPS,libwps) \ $(call gb_Helper_optional,LIBXML2,libxml2) \ libxmlsec \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 59c83e4..840081a 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,ORCUS,liborcus) \ $(call gb_Helper_optional,VISIO,libvisio) \ $(call gb_Helper_optional,WPD,libwpd) \ + $(call gb_Helper_optional,WPG,libwpg) \ )) # vim: set noet sw=4 ts=4: diff --git a/libwpg/ExternalProject_libwpg.mk b/external/libwpg/ExternalProject_libwpg.mk similarity index 100% rename from libwpg/ExternalProject_libwpg.mk rename to external/libwpg/ExternalProject_libwpg.mk diff --git a/libwpg/Makefile b/external/libwpg/Makefile similarity index 71% rename from libwpg/Makefile rename to external/libwpg/Makefile index ccb1c85..e4968cf 100644 --- a/libwpg/Makefile +++ b/external/libwpg/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/libwpg/Module_libwpg.mk b/external/libwpg/Module_libwpg.mk similarity index 93% rename from libwpg/Module_libwpg.mk rename to external/libwpg/Module_libwpg.mk index 411e71f..9e468a5 100644 --- a/libwpg/Module_libwpg.mk +++ b/external/libwpg/Module_libwpg.mk @@ -9,13 +9,9 @@ $(eval $(call gb_Module_Module,libwpg)) -ifeq ($(SYSTEM_WPG),NO) - $(eval $(call gb_Module_add_targets,libwpg,\ ExternalProject_libwpg \ UnpackedTarball_libwpg \ )) -endif - # vim: set noet sw=4 ts=4: diff --git a/libwpg/README b/external/libwpg/README similarity index 100% rename from libwpg/README rename to external/libwpg/README diff --git a/libwpg/UnpackedTarball_libwpg.mk b/external/libwpg/UnpackedTarball_libwpg.mk similarity index 100% rename from libwpg/UnpackedTarball_libwpg.mk rename to external/libwpg/UnpackedTarball_libwpg.mk _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
