RepositoryModule_host.mk | 1
external/Module_external.mk | 1
external/libexttextcat/ExternalPackage_fingerprint.mk | 172 ++++++++++++++++++
external/libexttextcat/ExternalProject_exttextcat.mk | 25 ++
external/libexttextcat/Makefile | 7
external/libexttextcat/Module_libexttextcat.mk | 26 ++
external/libexttextcat/README | 6
external/libexttextcat/StaticLibrary_exttextcat.mk | 25 ++
external/libexttextcat/UnpackedTarball_exttextcat.mk | 18 +
external/libexttextcat/exttextcat-msvc-stdint.patch | 21 ++
libexttextcat/ExternalPackage_fingerprint.mk | 172 ------------------
libexttextcat/ExternalProject_exttextcat.mk | 25 --
libexttextcat/Makefile | 7
libexttextcat/Module_libexttextcat.mk | 28 --
libexttextcat/README | 6
libexttextcat/StaticLibrary_exttextcat.mk | 25 --
libexttextcat/UnpackedTarball_exttextcat.mk | 18 -
libexttextcat/exttextcat-msvc-stdint.patch | 21 --
18 files changed, 301 insertions(+), 303 deletions(-)
New commits:
commit 36b554e96541f39ecc80b8ede3e260e3426a1936
Author: Khaled Hosny <khaledho...@eglug.org>
Date: Fri Oct 18 19:55:48 2013 +0200
fdo#70393: move libexttextcat to a subdir of external
Change-Id: Id4c27e0ed7ef31e0217a82160e18cc1b8e5858f7
Reviewed-on: https://gerrit.libreoffice.org/6329
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 5c7b49f..706a9e9 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 811079f..3e4326e 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
similarity index 100%
rename from libexttextcat/ExternalPackage_fingerprint.mk
rename to external/libexttextcat/ExternalPackage_fingerprint.mk
diff --git a/libexttextcat/ExternalProject_exttextcat.mk
b/external/libexttextcat/ExternalProject_exttextcat.mk
similarity index 100%
rename from libexttextcat/ExternalProject_exttextcat.mk
rename to external/libexttextcat/ExternalProject_exttextcat.mk
diff --git a/libexttextcat/Makefile b/external/libexttextcat/Makefile
similarity index 71%
rename from libexttextcat/Makefile
rename to external/libexttextcat/Makefile
index ccb1c85..e4968cf 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
similarity index 94%
rename from libexttextcat/Module_libexttextcat.mk
rename to external/libexttextcat/Module_libexttextcat.mk
index c1396de..1e74a88 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
similarity index 100%
rename from libexttextcat/README
rename to external/libexttextcat/README
diff --git a/libexttextcat/StaticLibrary_exttextcat.mk
b/external/libexttextcat/StaticLibrary_exttextcat.mk
similarity index 100%
rename from libexttextcat/StaticLibrary_exttextcat.mk
rename to external/libexttextcat/StaticLibrary_exttextcat.mk
diff --git a/libexttextcat/UnpackedTarball_exttextcat.mk
b/external/libexttextcat/UnpackedTarball_exttextcat.mk
similarity index 90%
rename from libexttextcat/UnpackedTarball_exttextcat.mk
rename to external/libexttextcat/UnpackedTarball_exttextcat.mk
index ef9ce13..66bad27 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
similarity index 100%
rename from libexttextcat/exttextcat-msvc-stdint.patch
rename to external/libexttextcat/exttextcat-msvc-stdint.patch
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
