diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-10-28 22:40:30 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-10-28 22:40:30 +0100 |
| commit | 327db9fe01dc727961ef9dfbc75b4dcbd2fea2eb (patch) | |
| tree | 973cab982d27ca4faa73b17853e7ef8b873aabd2 /hunspell | |
| parent | 30762128a8cbe218433a7d44c04b308809c9bd48 (diff) | |
fix hunspell and mythes library names
Change-Id: Ie660f8b3f885e3f26f188314433b9fbff27bf50a
Diffstat (limited to 'hunspell')
| -rw-r--r-- | hunspell/ExternalPackage_hunspell.mk | 4 | ||||
| -rw-r--r-- | hunspell/Module_hunspell.mk | 2 | ||||
| -rw-r--r-- | hunspell/StaticLibrary_hunspell.mk (renamed from hunspell/StaticLibrary_libhunspell.mk) | 10 |
3 files changed, 7 insertions, 9 deletions
diff --git a/hunspell/ExternalPackage_hunspell.mk b/hunspell/ExternalPackage_hunspell.mk index 5936b4006c0a..1cabd1973dd2 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 376ac35f6ea8..357873c878de 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_libhunspell.mk b/hunspell/StaticLibrary_hunspell.mk index 334897bb2cf6..dba22998f217 100644 --- a/hunspell/StaticLibrary_libhunspell.mk +++ b/hunspell/StaticLibrary_hunspell.mk @@ -7,18 +7,18 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_StaticLibrary_StaticLibrary,libhunspell)) +$(eval $(call gb_StaticLibrary_StaticLibrary,hunspell)) -$(eval $(call gb_StaticLibrary_use_unpacked,libhunspell,hunspell)) +$(eval $(call gb_StaticLibrary_use_unpacked,hunspell,hunspell)) -$(eval $(call gb_StaticLibrary_set_warnings_not_errors,libhunspell)) +$(eval $(call gb_StaticLibrary_set_warnings_not_errors,hunspell)) -$(eval $(call gb_StaticLibrary_add_defs,libhunspell,\ +$(eval $(call gb_StaticLibrary_add_defs,hunspell,\ -DHUNSPELL_STATIC \ -DOPENOFFICEORG \ )) -$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,libhunspell,\ +$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,hunspell,\ UnpackedTarball/hunspell/src/hunspell/affentry \ UnpackedTarball/hunspell/src/hunspell/affixmgr \ UnpackedTarball/hunspell/src/hunspell/dictmgr \ |