From 5f9cda2dc5e6d217328ff4f7da27a6f0e6fcf5de Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Fri, 1 Nov 2013 15:43:47 +0100
Subject: Repository*: no need to register libraries built via ExternalProject

Only libraries (and similar for executables) built as Library need to be
registered; those built via ExternalProject are delivered by Project and
used via gb_LinkTarget_add_libs.  This also means there is no need to
mangle the names in RepositoryFixes.mk.

Change-Id: Ib0b67f54e2eb6efdb0c454c9e2dd599ada229676
Reviewed-on: https://gerrit.libreoffice.org/6533
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
---
 RepositoryExternal.mk | 78 ++-------------------------------------------------
 1 file changed, 2 insertions(+), 76 deletions(-)

(limited to 'RepositoryExternal.mk')

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d3b8dc5f1167..568d2ac58837 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -192,10 +192,6 @@ endef
 
 else
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\
-    cppunit \
-))
-
 define gb_LinkTarget__use_cppunit
 $(call gb_LinkTarget_use_external_project,$(1),cppunit)
 
@@ -767,10 +763,6 @@ gb_ExternalProject__use_libxml2:=
 
 else # !SYSTEM_LIBXML
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
-	xml2 \
-))
-
 define gb_LinkTarget__use_libxml2
 $(call gb_LinkTarget_use_package,$(1),xml2)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -820,11 +812,6 @@ endef
 
 else # !SYSTEM_LIBXSLT
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	exslt \
-	xslt \
-))
-
 define gb_LinkTarget__use_libxslt
 $(call gb_LinkTarget_use_package,$(1),xslt)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -990,11 +977,13 @@ endef
 
 ifneq ($(OS),ANDROID)
 
+ifeq ($(COM),MSC)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 	raptor2 \
 	rasqal \
 	rdf \
 ))
+endif
 
 define gb_LinkTarget__use_librdf
 $(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland)
@@ -1039,13 +1028,6 @@ endef
 
 else ifeq ($(SYSTEM_CAIRO),NO)
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	cairo \
-	$(if $(filter-out MACOSX WNT,$(OS)), \
-		pixman-1 \
-	) \
-))
-
 define gb_LinkTarget__use_cairo
 $(call gb_LinkTarget_use_package,$(1),cairo)
 $(call gb_LinkTarget_use_package,$(1),pixman)
@@ -1206,21 +1188,6 @@ $(call gb_ExternalProject_use_package,$(1),icu)
 endef
 
 # icudata and icui18n is called icudt and icuin when built with MSVC :-/
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	icudt \
-	icuin \
-))
-else
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	icudata$(gb_ICU_suffix) \
-	icui18n$(gb_ICU_suffix) \
-))
-endif
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	icuuc$(gb_ICU_suffix) \
-))
-
 define gb_LinkTarget__use_icudata
 $(call gb_LinkTarget_use_package,$(1),icu)
 
@@ -1323,13 +1290,6 @@ endef
 
 else # !SYSTEM_OPENSSL
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-    crypto \
-    ssl \
-))
-endif
-
 define gb_ExternalProject__use_openssl
 $(call gb_ExternalProject_use_package,$(1),openssl)
 
@@ -1745,10 +1705,6 @@ endef
 
 else
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	lcms2 \
-))
-
 define gb_LinkTarget__use_lcms2
 $(call gb_LinkTarget_use_package,$(1),lcms2)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -1775,10 +1731,6 @@ endef
 
 else # !SYSTEM_LPSOLVE
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	lpsolve55 \
-))
-
 define gb_LinkTarget__use_lpsolve
 $(call gb_LinkTarget_use_unpacked,$(1),lpsolve)
 ifeq ($(COM),MSC)
@@ -2020,10 +1972,6 @@ endef
 
 else # !SYSTEM_CURL
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-	curl \
-))
-
 define gb_LinkTarget__use_curl
 $(call gb_LinkTarget_use_package,$(1),curl)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -2248,10 +2196,6 @@ else # !SYSTEM_FIREBIRD
 
 #$(call gb_LinkTarget__use_libatomic_ops,$(1))
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-    fbembed \
-))
-
 define gb_LinkTarget__use_libfbembed
 $(call gb_LinkTarget_use_package,$(1),firebird)
 $(call gb_LinkTarget_set_include,$(1),\
@@ -2420,11 +2364,6 @@ endif # !GCC
 
 endef
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\
-	xpcom \
-	xpcom_core \
-))
-
 endif # DESKTOP
 
 ifeq ($(ENABLE_KDE),TRUE)
@@ -2601,11 +2540,6 @@ endif
 
 endef
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
-	python$(PYTHON_VERSION_MAJOR) \
-	python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \
-))
-
 endif # SYSTEM_PYTHON
 
 # ORCUS
@@ -2740,14 +2674,6 @@ endef
 
 else
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
-    nspr4 \
-    nss3 \
-    plc4 \
-    smime3 \
-	ssl3 \
-))
-
 define gb_LinkTarget__use_nss3
 $(call gb_LinkTarget_use_package,$(1),nss)
 $(call gb_LinkTarget_set_include,$(1),\
-- 
cgit