RepositoryExternal.mk | 2 -
libexttextcat/ExternalPackage_exttextcat.mk | 22 ++++++++++++++++++++
libexttextcat/ExternalPackage_libexttextcat.mk | 22 --------------------
libexttextcat/ExternalProject_exttextcat.mk | 27 +++++++++++++++++++++++++
libexttextcat/ExternalProject_libexttextcat.mk | 27 -------------------------
libexttextcat/Module_libexttextcat.mk | 6 ++---
libexttextcat/StaticLibrary_exttextcat.mk | 10 ++++-----
libexttextcat/UnpackedTarball_exttextcat.mk | 18 ++++++++++++++++
libexttextcat/UnpackedTarball_libexttextcat.mk | 18 ----------------
9 files changed, 76 insertions(+), 76 deletions(-)
New commits:
commit 093acfe13c8f63807c0d004b78844c6f39d1160c
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Nov 10 11:47:50 2012 -0500
cleanup libexttextcat naming
Change-Id: I8aee95e0f93deaaf08046f544713af010a7f1e44
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index eb5e22e..019f0be 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -512,7 +512,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
)
$(call gb_LinkTarget_set_include,$(1),\
- -I$(call gb_UnpackedTarball_get_dir,libexttextcat/src) \
+ -I$(call gb_UnpackedTarball_get_dir,exttextcat/src) \
$$(INCLUDE) \
)
diff --git a/libexttextcat/ExternalPackage_exttextcat.mk
b/libexttextcat/ExternalPackage_exttextcat.mk
new file mode 100644
index 0000000..cf79b28
--- /dev/null
+++ b/libexttextcat/ExternalPackage_exttextcat.mk
@@ -0,0 +1,22 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,exttextcat,exttextcat))
+
+ifneq ($(COM),MSC)
+
+$(eval $(call gb_ExternalPackage_use_external_project,exttextcat,exttextcat))
+
+$(eval $(call
gb_ExternalPackage_add_file,exttextcat,lib/libexttextcat.a,src/.libs/libexttextcat-1.0.a))
+ifeq ($(OS),WNT)
+$(eval $(call
gb_ExternalPackage_add_file,exttextcat,bin/libexttextcat.dll,src/.libs/libexttextcat.dll))
+endif
+
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/libexttextcat/ExternalPackage_libexttextcat.mk
b/libexttextcat/ExternalPackage_libexttextcat.mk
deleted file mode 100644
index 21a1a90..0000000
--- a/libexttextcat/ExternalPackage_libexttextcat.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,libexttextcat,libexttextcat))
-
-ifneq ($(COM),MSC)
-
-$(eval $(call
gb_ExternalPackage_use_external_project,libexttextcat,libexttextcat))
-
-$(eval $(call
gb_ExternalPackage_add_file,libexttextcat,lib/libexttextcat.a,src/.libs/libexttextcat-1.0.a))
-ifeq ($(OS),WNT)
-$(eval $(call
gb_ExternalPackage_add_file,libexttextcat,bin/libexttextcat.dll,src/.libs/libexttextcat.dll))
-endif
-
-endif
-# vim: set noet sw=4 ts=4:
diff --git a/libexttextcat/ExternalProject_exttextcat.mk
b/libexttextcat/ExternalProject_exttextcat.mk
new file mode 100644
index 0000000..f439d08
--- /dev/null
+++ b/libexttextcat/ExternalProject_exttextcat.mk
@@ -0,0 +1,27 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalProject_ExternalProject,exttextcat))
+
+$(eval $(call gb_ExternalProject_use_unpacked,exttextcat,exttextcat))
+
+$(eval $(call gb_ExternalProject_register_targets,exttextcat,\
+ build \
+))
+
+$(call gb_ExternalProject_get_state_target,exttextcat,build):
+ cd $(EXTERNAL_WORKDIR) \
+ && ./configure --disable-shared --with-pic \
+ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
+ CFLAGS="$(if $(filter
TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),-fvisibility=hidden) \
+ $(if $(filter AIX,$(OS)),-D_LINUX_SOURCE_COMPAT)" \
+ && $(MAKE) \
+ && touch $@
+
+# vim: set noet sw=4 ts=4:
diff --git a/libexttextcat/ExternalProject_libexttextcat.mk
b/libexttextcat/ExternalProject_libexttextcat.mk
deleted file mode 100644
index e792b3f..0000000
--- a/libexttextcat/ExternalProject_libexttextcat.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,libexttextcat))
-
-$(eval $(call gb_ExternalProject_use_unpacked,libexttextcat,libexttextcat))
-
-$(eval $(call gb_ExternalProject_register_targets,libexttextcat,\
- build \
-))
-
-$(call gb_ExternalProject_get_state_target,libexttextcat,build):
- cd $(EXTERNAL_WORKDIR) \
- && ./configure --disable-shared --with-pic \
- $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
- CFLAGS="$(if $(filter
TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),-fvisibility=hidden) \
- $(if $(filter AIX,$(OS)),-D_LINUX_SOURCE_COMPAT)" \
- && $(MAKE) \
- && touch $@
-
-# vim: set noet sw=4 ts=4:
diff --git a/libexttextcat/Module_libexttextcat.mk
b/libexttextcat/Module_libexttextcat.mk
index 7aa1e10..bf65b04 100644
--- a/libexttextcat/Module_libexttextcat.mk
+++ b/libexttextcat/Module_libexttextcat.mk
@@ -11,8 +11,8 @@ $(eval $(call gb_Module_Module,libexttextcat))
ifeq ($(SYSTEM_LIBEXTTEXTCAT),NO)
$(eval $(call gb_Module_add_targets,libexttextcat,\
- UnpackedTarball_libexttextcat \
- ExternalPackage_libexttextcat \
+ UnpackedTarball_exttextcat \
+ ExternalPackage_exttextcat \
Zip_fingerprint \
))
ifeq ($(COM),MSC)
@@ -21,7 +21,7 @@ $(eval $(call gb_Module_add_targets,libexttextcat,\
))
else
$(eval $(call gb_Module_add_targets,libexttextcat,\
- ExternalProject_libexttextcat \
+ ExternalProject_exttextcat \
))
endif
endif
diff --git a/libexttextcat/StaticLibrary_exttextcat.mk
b/libexttextcat/StaticLibrary_exttextcat.mk
index 194aa6b..ec2d896 100644
--- a/libexttextcat/StaticLibrary_exttextcat.mk
+++ b/libexttextcat/StaticLibrary_exttextcat.mk
@@ -14,11 +14,11 @@ $(eval $(call
gb_StaticLibrary_use_unpacked,exttextcat,libexttextcat))
$(eval $(call gb_StaticLibrary_set_warnings_not_errors,exttextcat))
$(eval $(call gb_StaticLibrary_add_generated_cobjects,exttextcat,\
- UnpackedTarball/libexttextcat/src/common \
- UnpackedTarball/libexttextcat/src/fingerprint \
- UnpackedTarball/libexttextcat/src/textcat \
- UnpackedTarball/libexttextcat/src/wg_mempool \
- UnpackedTarball/libexttextcat/src/utf8misc \
+ UnpackedTarball/exttextcat/src/common \
+ UnpackedTarball/exttextcat/src/fingerprint \
+ UnpackedTarball/exttextcat/src/textcat \
+ UnpackedTarball/exttextcat/src/wg_mempool \
+ UnpackedTarball/exttextcat/src/utf8misc \
))
diff --git a/libexttextcat/UnpackedTarball_exttextcat.mk
b/libexttextcat/UnpackedTarball_exttextcat.mk
new file mode 100644
index 0000000..ef90108
--- /dev/null
+++ b/libexttextcat/UnpackedTarball_exttextcat.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,exttextcat))
+
+$(eval $(call
gb_UnpackedTarball_set_tarball,exttextcat,$(LIBEXTTEXTCAT_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,exttextcat,\
+ libexttextcat/android.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/libexttextcat/UnpackedTarball_libexttextcat.mk
b/libexttextcat/UnpackedTarball_libexttextcat.mk
deleted file mode 100644
index bd8fae6..0000000
--- a/libexttextcat/UnpackedTarball_libexttextcat.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_UnpackedTarball_UnpackedTarball,libexttextcat))
-
-$(eval $(call
gb_UnpackedTarball_set_tarball,libexttextcat,$(LIBEXTTEXTCAT_TARBALL)))
-
-$(eval $(call gb_UnpackedTarball_add_patches,libexttextcat,\
- libexttextcat/android.patch \
-))
-
-# vim: set noet sw=4 ts=4:
commit bd5ce1784c0f139e287f3d0f7ab50b030453e6b8
Author: Peter Foley <pefol...@verizon.net>
Date: Sat Nov 10 11:39:44 2012 -0500
try to fix libexttextcat for mingw again
Change-Id: If212bfe5cc191c253185df0c459f7abb8be51da2
diff --git a/libexttextcat/ExternalPackage_libexttextcat.mk
b/libexttextcat/ExternalPackage_libexttextcat.mk
index 781a274..21a1a90 100644
--- a/libexttextcat/ExternalPackage_libexttextcat.mk
+++ b/libexttextcat/ExternalPackage_libexttextcat.mk
@@ -15,7 +15,7 @@ $(eval $(call
gb_ExternalPackage_use_external_project,libexttextcat,libexttextca
$(eval $(call
gb_ExternalPackage_add_file,libexttextcat,lib/libexttextcat.a,src/.libs/libexttextcat-1.0.a))
ifeq ($(OS),WNT)
-$(eval $(call
gb_ExternalPackage_add_file,libexttextcat,bin/libexttextcat.dll,src/.libs/libexttextcat-1.0.dll))
+$(eval $(call
gb_ExternalPackage_add_file,libexttextcat,bin/libexttextcat.dll,src/.libs/libexttextcat.dll))
endif
endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
