diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-18 19:55:48 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-19 07:34:08 +0000 |
| commit | 36b554e96541f39ecc80b8ede3e260e3426a1936 (patch) | |
| tree | dac9d2e0540f8b61ce14370e281bfb9227c07d07 | |
| parent | e65ca87fd172503635e44b57b541a20b2632b710 (diff) | |
fdo#70393: move libexttextcat to a subdir of external
Change-Id: Id4c27e0ed7ef31e0217a82160e18cc1b8e5858f7
Reviewed-on: https://gerrit.libreoffice.org/6329
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/libexttextcat/ExternalPackage_fingerprint.mk (renamed from libexttextcat/ExternalPackage_fingerprint.mk) | 0 | ||||
| -rw-r--r-- | external/libexttextcat/ExternalProject_exttextcat.mk (renamed from libexttextcat/ExternalProject_exttextcat.mk) | 0 | ||||
| -rw-r--r-- | external/libexttextcat/Makefile (renamed from libexttextcat/Makefile) | 2 | ||||
| -rw-r--r-- | external/libexttextcat/Module_libexttextcat.mk (renamed from libexttextcat/Module_libexttextcat.mk) | 2 | ||||
| -rw-r--r-- | external/libexttextcat/README (renamed from libexttextcat/README) | 0 | ||||
| -rw-r--r-- | external/libexttextcat/StaticLibrary_exttextcat.mk (renamed from libexttextcat/StaticLibrary_exttextcat.mk) | 0 | ||||
| -rw-r--r-- | external/libexttextcat/UnpackedTarball_exttextcat.mk (renamed from libexttextcat/UnpackedTarball_exttextcat.mk) | 2 | ||||
| -rw-r--r-- | external/libexttextcat/exttextcat-msvc-stdint.patch (renamed from libexttextcat/exttextcat-msvc-stdint.patch) | 0 |
10 files changed, 3 insertions, 5 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 5c7b49fe841c..706a9e92038f 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,LIBEXTTEXTCAT,libexttextcat) \ $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ $(call gb_Helper_optional,MSPUB,libmspub) \ $(call gb_Helper_optional,MWAW,libmwaw) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 811079fde7ae..3e4326e8b130 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,JFREEREPORT,jfreereport) \ $(call gb_Helper_optional,LCMS2,lcms2) \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ + $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ $(call gb_Helper_optional,LIBPNG,libpng) \ )) diff --git a/libexttextcat/ExternalPackage_fingerprint.mk b/external/libexttextcat/ExternalPackage_fingerprint.mk index 027d1ce810eb..027d1ce810eb 100644 --- a/libexttextcat/ExternalPackage_fingerprint.mk +++ b/external/libexttextcat/ExternalPackage_fingerprint.mk diff --git a/libexttextcat/ExternalProject_exttextcat.mk b/external/libexttextcat/ExternalProject_exttextcat.mk index 68035ca6d684..68035ca6d684 100644 --- a/libexttextcat/ExternalProject_exttextcat.mk +++ b/external/libexttextcat/ExternalProject_exttextcat.mk diff --git a/libexttextcat/Makefile b/external/libexttextcat/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/libexttextcat/Makefile +++ b/external/libexttextcat/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/libexttextcat/Module_libexttextcat.mk b/external/libexttextcat/Module_libexttextcat.mk index c1396de388e4..1e74a88f3878 100644 --- a/libexttextcat/Module_libexttextcat.mk +++ b/external/libexttextcat/Module_libexttextcat.mk @@ -9,7 +9,6 @@ $(eval $(call gb_Module_Module,libexttextcat)) -ifeq ($(SYSTEM_LIBEXTTEXTCAT),NO) $(eval $(call gb_Module_add_targets,libexttextcat,\ ExternalPackage_fingerprint \ UnpackedTarball_exttextcat \ @@ -23,6 +22,5 @@ $(eval $(call gb_Module_add_targets,libexttextcat,\ ExternalProject_exttextcat \ )) endif -endif # vim: set noet sw=4 ts=4: diff --git a/libexttextcat/README b/external/libexttextcat/README index c35b88f013bc..c35b88f013bc 100644 --- a/libexttextcat/README +++ b/external/libexttextcat/README diff --git a/libexttextcat/StaticLibrary_exttextcat.mk b/external/libexttextcat/StaticLibrary_exttextcat.mk index a2c99411eaf1..a2c99411eaf1 100644 --- a/libexttextcat/StaticLibrary_exttextcat.mk +++ b/external/libexttextcat/StaticLibrary_exttextcat.mk diff --git a/libexttextcat/UnpackedTarball_exttextcat.mk b/external/libexttextcat/UnpackedTarball_exttextcat.mk index ef9ce13c4313..66bad2715333 100644 --- a/libexttextcat/UnpackedTarball_exttextcat.mk +++ b/external/libexttextcat/UnpackedTarball_exttextcat.mk @@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,exttextcat)) $(eval $(call gb_UnpackedTarball_set_tarball,exttextcat,$(LIBEXTTEXTCAT_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,exttextcat,\ - libexttextcat/exttextcat-msvc-stdint.patch \ + external/libexttextcat/exttextcat-msvc-stdint.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/libexttextcat/exttextcat-msvc-stdint.patch b/external/libexttextcat/exttextcat-msvc-stdint.patch index 09da3e3961a6..09da3e3961a6 100644 --- a/libexttextcat/exttextcat-msvc-stdint.patch +++ b/external/libexttextcat/exttextcat-msvc-stdint.patch |