moz: remove Package moz_lib

Use xpcom libs from UnpackedTarball; the nsldap32 libs appear to be
unused (presumably postgresql uses some MS LDAP libs).

Change-Id: I56c6b9d38a11a39b8b0e878c892f30926d50284c

RepositoryExternal.mk

@@ -2285,9 +2285,9 @@ $(call gb_LinkTarget_set_include,$(1),\
 $(call gb_LinkTarget_add_libs,$(1),\
 	$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/nspr4.lib \
 )
-$(call gb_LinkTarget_use_libraries,$(1),\
-	xpcom \
-	xpcom_core \
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,moz_lib)/xpcom.lib \
+	$(call gb_UnpackedTarball_get_dir,moz_lib)/xpcom_core.lib \
 )
 
 $(call gb_LinkTarget_add_defs,$(1),\

external/moz/ExternalPackage_moz_lib.mk

@@ -1,21 +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_ExternalPackage_ExternalPackage,moz_lib,moz_lib))
-
-$(eval $(call gb_ExternalPackage_set_outdir,moz_lib,$(OUTDIR)))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,moz_lib,lib,\
-	nslber32v50.lib \
-	nsldap32v50.lib \
-	xpcom.lib \
-	xpcom_core.lib \
-))
-
-# vim: set noet sw=4 ts=4:

external/moz/Module_moz.mk

@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,moz))
 ifeq ($(WITH_MOZAB4WIN),YES)
 
 $(eval $(call gb_Module_add_targets,moz,\
-	ExternalPackage_moz_lib \
 	ExternalPackage_runtime \
 	UnpackedTarball_moz_inc \
 	UnpackedTarball_moz_lib \