RepositoryModule_host.mk | 1 external/Module_external.mk | 1 external/lcms2/ExternalPackage_lcms2.mk | 32 +++++++++++++++++++++++ external/lcms2/ExternalProject_lcms2.mk | 38 +++++++++++++++++++++++++++ external/lcms2/Makefile | 7 +++++ external/lcms2/Module_lcms2.mk | 18 +++++++++++++ external/lcms2/README | 3 ++ external/lcms2/UnpackedTarball_lcms2.mk | 20 ++++++++++++++ external/lcms2/lcms2-2.4-windows.patch | 44 ++++++++++++++++++++++++++++++++ external/lcms2/lcms2.patch | 20 ++++++++++++++ lcms2/ExternalPackage_lcms2.mk | 32 ----------------------- lcms2/ExternalProject_lcms2.mk | 38 --------------------------- lcms2/Makefile | 7 ----- lcms2/Module_lcms2.mk | 20 -------------- lcms2/README | 3 -- lcms2/UnpackedTarball_lcms2.mk | 20 -------------- lcms2/lcms2-2.4-windows.patch | 44 -------------------------------- lcms2/lcms2.patch | 20 -------------- 18 files changed, 183 insertions(+), 185 deletions(-)
New commits: commit 63f6d64ca1f6944953c448f8f75acedb5df991c4 Author: Khaled Hosny <[email protected]> Date: Fri Oct 18 18:59:17 2013 +0200 fdo#70393: move lcms2 to a subdir of external Change-Id: I122a8564795f3a422d6bb10a5d6a845b72e77102 Reviewed-on: https://gerrit.libreoffice.org/6327 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index f7f85d7..f87b6b4 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -70,7 +70,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ jvmaccess \ jvmfwk \ $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ - $(call gb_Helper_optional,LCMS2,lcms2) \ $(call gb_Helper_optional,CDR,libcdr) \ $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index c65474e..44dadc5 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,HYPHEN,hyphen) \ $(call gb_Helper_optional,ICU,icu) \ $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ + $(call gb_Helper_optional,LCMS2,lcms2) \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ $(call gb_Helper_optional,LIBPNG,libpng) \ )) diff --git a/lcms2/ExternalPackage_lcms2.mk b/external/lcms2/ExternalPackage_lcms2.mk similarity index 100% rename from lcms2/ExternalPackage_lcms2.mk rename to external/lcms2/ExternalPackage_lcms2.mk diff --git a/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk similarity index 100% rename from lcms2/ExternalProject_lcms2.mk rename to external/lcms2/ExternalProject_lcms2.mk diff --git a/lcms2/Makefile b/external/lcms2/Makefile similarity index 71% rename from lcms2/Makefile rename to external/lcms2/Makefile index ccb1c85..e4968cf 100644 --- a/lcms2/Makefile +++ b/external/lcms2/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/lcms2/Module_lcms2.mk b/external/lcms2/Module_lcms2.mk similarity index 94% rename from lcms2/Module_lcms2.mk rename to external/lcms2/Module_lcms2.mk index 898af93..807dbae 100644 --- a/lcms2/Module_lcms2.mk +++ b/external/lcms2/Module_lcms2.mk @@ -9,12 +9,10 @@ $(eval $(call gb_Module_Module,lcms2)) -ifeq ($(SYSTEM_LCMS2),NO) $(eval $(call gb_Module_add_targets,lcms2,\ UnpackedTarball_lcms2 \ ExternalPackage_lcms2 \ ExternalProject_lcms2 \ )) -endif # vim: set noet sw=4 ts=4: diff --git a/lcms2/README b/external/lcms2/README similarity index 100% rename from lcms2/README rename to external/lcms2/README diff --git a/lcms2/UnpackedTarball_lcms2.mk b/external/lcms2/UnpackedTarball_lcms2.mk similarity index 89% rename from lcms2/UnpackedTarball_lcms2.mk rename to external/lcms2/UnpackedTarball_lcms2.mk index 4d6cfda..b128ba3 100644 --- a/lcms2/UnpackedTarball_lcms2.mk +++ b/external/lcms2/UnpackedTarball_lcms2.mk @@ -13,8 +13,8 @@ $(eval $(call gb_UnpackedTarball_set_tarball,lcms2,$(LCMS2_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,lcms2,3)) $(eval $(call gb_UnpackedTarball_add_patches,lcms2,\ - lcms2/lcms2.patch \ - lcms2/lcms2-2.4-windows.patch \ + external/lcms2/lcms2.patch \ + external/lcms2/lcms2-2.4-windows.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/lcms2/lcms2-2.4-windows.patch b/external/lcms2/lcms2-2.4-windows.patch similarity index 100% rename from lcms2/lcms2-2.4-windows.patch rename to external/lcms2/lcms2-2.4-windows.patch diff --git a/lcms2/lcms2.patch b/external/lcms2/lcms2.patch similarity index 100% rename from lcms2/lcms2.patch rename to external/lcms2/lcms2.patch _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
