RepositoryExternal.mk | 9 ++++----
hunspell/ExternalPackage_hunspell.mk | 4 ---
hunspell/Module_hunspell.mk | 2 -
hunspell/StaticLibrary_hunspell.mk | 35 ++++++++++++++++++++++++++++++++++
hunspell/StaticLibrary_libhunspell.mk | 35 ----------------------------------
mythes/ExternalPackage_mythes.mk | 4 ---
6 files changed, 43 insertions(+), 46 deletions(-)
New commits:
commit 327db9fe01dc727961ef9dfbc75b4dcbd2fea2eb
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sun Oct 28 22:40:30 2012 +0100
fix hunspell and mythes library names
Change-Id: Ie660f8b3f885e3f26f188314433b9fbff27bf50a
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d4fd15f..52d99a2 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -255,9 +255,10 @@ define gb_LinkTarget__use_mythes
$(call gb_LinkTarget_use_package,$(1),\
mythes \
)
-$(call gb_LinkTarget_add_libs,$(1),\
- $(if $(filter MSC,$(COM)),libmythes.lib,-lmythes-1.2) \
+$(call gb_LinkTarget_use_static_libraries,$(1),\
+ mythes \
)
+
endef
endif # SYSTEM_MYTHES
@@ -343,7 +344,7 @@ endef
else # !SYSTEM_HUNSPELL
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
- $(if $(filter MSC,$(COM)),libhunspell,hunspell-1.3) \
+ hunspell \
))
define gb_LinkTarget__use_hunspell
@@ -355,7 +356,7 @@ $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,hunspell/src/hunspell)\
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
- $(if $(filter MSC,$(COM)),libhunspell,hunspell-1.3) \
+ hunspell \
)
endef
diff --git a/hunspell/ExternalPackage_hunspell.mk
b/hunspell/ExternalPackage_hunspell.mk
index 5936b40..1cabd19 100644
--- a/hunspell/ExternalPackage_hunspell.mk
+++ b/hunspell/ExternalPackage_hunspell.mk
@@ -13,9 +13,7 @@ ifneq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_use_external_project,hunspell,hunspell))
-$(eval $(call gb_ExternalPackage_add_files,hunspell,lib,\
- src/hunspell/.libs/libhunspell-1.3.a \
-))
+$(eval $(call
gb_ExternalPackage_add_file,hunspell,lib/libhunspell.a,src/hunspell/.libs/libhunspell-1.3.a))
endif
diff --git a/hunspell/Module_hunspell.mk b/hunspell/Module_hunspell.mk
index 376ac35..357873c 100644
--- a/hunspell/Module_hunspell.mk
+++ b/hunspell/Module_hunspell.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Module_add_targets,hunspell,\
))
ifeq ($(COM),MSC)
$(eval $(call gb_Module_add_targets,hunspell,\
- StaticLibrary_libhunspell \
+ StaticLibrary_hunspell \
))
else
$(eval $(call gb_Module_add_targets,hunspell,\
diff --git a/hunspell/StaticLibrary_hunspell.mk
b/hunspell/StaticLibrary_hunspell.mk
new file mode 100644
index 0000000..dba2299
--- /dev/null
+++ b/hunspell/StaticLibrary_hunspell.mk
@@ -0,0 +1,35 @@
+# -*- 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_StaticLibrary_StaticLibrary,hunspell))
+
+$(eval $(call gb_StaticLibrary_use_unpacked,hunspell,hunspell))
+
+$(eval $(call gb_StaticLibrary_set_warnings_not_errors,hunspell))
+
+$(eval $(call gb_StaticLibrary_add_defs,hunspell,\
+ -DHUNSPELL_STATIC \
+ -DOPENOFFICEORG \
+))
+
+$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,hunspell,\
+ UnpackedTarball/hunspell/src/hunspell/affentry \
+ UnpackedTarball/hunspell/src/hunspell/affixmgr \
+ UnpackedTarball/hunspell/src/hunspell/dictmgr \
+ UnpackedTarball/hunspell/src/hunspell/csutil \
+ UnpackedTarball/hunspell/src/hunspell/hashmgr \
+ UnpackedTarball/hunspell/src/hunspell/suggestmgr \
+ UnpackedTarball/hunspell/src/hunspell/phonet \
+ UnpackedTarball/hunspell/src/hunspell/hunzip \
+ UnpackedTarball/hunspell/src/hunspell/filemgr \
+ UnpackedTarball/hunspell/src/hunspell/replist \
+ UnpackedTarball/hunspell/src/hunspell/hunspell \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/hunspell/StaticLibrary_libhunspell.mk
b/hunspell/StaticLibrary_libhunspell.mk
deleted file mode 100644
index 334897b..0000000
--- a/hunspell/StaticLibrary_libhunspell.mk
+++ /dev/null
@@ -1,35 +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_StaticLibrary_StaticLibrary,libhunspell))
-
-$(eval $(call gb_StaticLibrary_use_unpacked,libhunspell,hunspell))
-
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,libhunspell))
-
-$(eval $(call gb_StaticLibrary_add_defs,libhunspell,\
- -DHUNSPELL_STATIC \
- -DOPENOFFICEORG \
-))
-
-$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,libhunspell,\
- UnpackedTarball/hunspell/src/hunspell/affentry \
- UnpackedTarball/hunspell/src/hunspell/affixmgr \
- UnpackedTarball/hunspell/src/hunspell/dictmgr \
- UnpackedTarball/hunspell/src/hunspell/csutil \
- UnpackedTarball/hunspell/src/hunspell/hashmgr \
- UnpackedTarball/hunspell/src/hunspell/suggestmgr \
- UnpackedTarball/hunspell/src/hunspell/phonet \
- UnpackedTarball/hunspell/src/hunspell/hunzip \
- UnpackedTarball/hunspell/src/hunspell/filemgr \
- UnpackedTarball/hunspell/src/hunspell/replist \
- UnpackedTarball/hunspell/src/hunspell/hunspell \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/mythes/ExternalPackage_mythes.mk b/mythes/ExternalPackage_mythes.mk
index 2c56ba0..553af2e 100644
--- a/mythes/ExternalPackage_mythes.mk
+++ b/mythes/ExternalPackage_mythes.mk
@@ -13,9 +13,7 @@ ifneq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_use_external_project,mythes,mythes))
-$(eval $(call gb_ExternalPackage_add_files,mythes,lib,\
- .libs/libmythes-1.2.a \
-))
+$(eval $(call
gb_ExternalPackage_add_file,mythes,lib/libmythes.a,.libs/libmythes-1.2.a))
endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
