diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 18:59:17 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-19 07:33:08 +0000 |
| commit | 63f6d64ca1f6944953c448f8f75acedb5df991c4 (patch) | |
| tree | 584a8a5d2d57416b9ab663b18ee1994d69e13b17 | |
| parent | a52215833280fd2c76d6df491a199f1ffab3e040 (diff) | |
fdo#70393: move lcms2 to a subdir of external
Change-Id: I122a8564795f3a422d6bb10a5d6a845b72e77102
Reviewed-on: https://gerrit.libreoffice.org/6327
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/lcms2/ExternalPackage_lcms2.mk (renamed from lcms2/ExternalPackage_lcms2.mk) | 0 | ||||
| -rw-r--r-- | external/lcms2/ExternalProject_lcms2.mk (renamed from lcms2/ExternalProject_lcms2.mk) | 0 | ||||
| -rw-r--r-- | external/lcms2/Makefile (renamed from lcms2/Makefile) | 2 | ||||
| -rw-r--r-- | external/lcms2/Module_lcms2.mk (renamed from lcms2/Module_lcms2.mk) | 2 | ||||
| -rw-r--r-- | external/lcms2/README (renamed from lcms2/README) | 0 | ||||
| -rw-r--r-- | external/lcms2/UnpackedTarball_lcms2.mk (renamed from lcms2/UnpackedTarball_lcms2.mk) | 4 | ||||
| -rw-r--r-- | external/lcms2/lcms2-2.4-windows.patch (renamed from lcms2/lcms2-2.4-windows.patch) | 0 | ||||
| -rw-r--r-- | external/lcms2/lcms2.patch (renamed from lcms2/lcms2.patch) | 0 |
10 files changed, 4 insertions, 6 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index f7f85d7120ae..f87b6b45a1c3 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 c65474e84d01..44dadc582b9e 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 index 395be9a1b9f3..395be9a1b9f3 100644 --- a/lcms2/ExternalPackage_lcms2.mk +++ b/external/lcms2/ExternalPackage_lcms2.mk diff --git a/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk index e128b24f5ea4..e128b24f5ea4 100644 --- a/lcms2/ExternalProject_lcms2.mk +++ b/external/lcms2/ExternalProject_lcms2.mk diff --git a/lcms2/Makefile b/external/lcms2/Makefile index ccb1c85a04da..e4968cf85fb6 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 index 898af93bce76..807dbae43854 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 index 10b18a5ad939..10b18a5ad939 100644 --- a/lcms2/README +++ b/external/lcms2/README diff --git a/lcms2/UnpackedTarball_lcms2.mk b/external/lcms2/UnpackedTarball_lcms2.mk index 4d6cfda74a48..b128ba3936de 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 index f1c681aee7f2..f1c681aee7f2 100644 --- a/lcms2/lcms2-2.4-windows.patch +++ b/external/lcms2/lcms2-2.4-windows.patch diff --git a/lcms2/lcms2.patch b/external/lcms2/lcms2.patch index d0eca1fb86b3..d0eca1fb86b3 100644 --- a/lcms2/lcms2.patch +++ b/external/lcms2/lcms2.patch |