libwpd: rename library on deliver to have only one MSVC special case

Change-Id: I3d0f899b5c8e8605d1cfd3a7d717da999f0f2350

RepositoryExternal.mk

@@ -1020,21 +1020,6 @@ endef
 
 else # !SYSTEM_LIBWPD
 
-ifeq ($(OS)$(COM),WNTMSC)
-
-$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
-	libwpd-0.9 \
-))
-
-define gb_LinkTarget__use_wpd
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	libwpd-0.9 \
-)
-
-endef
-
-else # !WNTMSC
-
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
 	wpd-0.9 \
 ))
@@ -1046,8 +1031,6 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 
 endef
 
-endif # WNTMSC
-
 endif # SYSTEM_LIBWPD
 
 

libwpd/ExternalPackage_libwpd.mk

@@ -31,7 +31,7 @@ $(eval $(call gb_Package_Package,libwpd,$(call gb_UnpackedTarball_get_dir,wpd)))
 $(eval $(call gb_Package_use_external_project,libwpd,libwpd))
 
 ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.lib,build/win32/Release/lib/libwpd-0.9.lib))
+$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/wpd-0.9.lib,build/win32/Release/lib/libwpd-0.9.lib))
 else
 $(eval $(call gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.a,src/lib/.libs/libwpd-0.9.a))
 endif