diff options
| -rw-r--r-- | RepositoryExternal.mk | 9 | ||||
| -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 | ||||
| -rw-r--r-- | mythes/ExternalPackage_mythes.mk | 4 |
5 files changed, 13 insertions, 16 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d4fd15f028dc..52d99a2dce3e 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 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 \ diff --git a/mythes/ExternalPackage_mythes.mk b/mythes/ExternalPackage_mythes.mk index 2c56ba02bd3e..553af2e8533a 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 |