fix hunspell and mythes library names

Change-Id: Ie660f8b3f885e3f26f188314433b9fbff27bf50a

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

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
 

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,\

hunspell/StaticLibrary_libhunspell.mk → 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 \

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