gbuild: remove gb_ExternalPackage_add_library_for_install

Deliver all external libraries to INSTDIR directly.

Change-Id: I8d3e035e5cfa07bd0f53ee4a226c48d4b86a4032

16 files changed, 85 insertions, 90 deletions

diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk
index 83c0bd5df9de..34462f6fff66 100644
--- a/external/cairo/ExternalPackage_cairo.mk
+++ b/external/cairo/ExternalPackage_cairo.mk
@@ -9,8 +9,10 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,cairo,cairo))
 
+$(eval $(call gb_ExternalPackage_set_outdir,cairo,$(INSTROOT)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo))
 
-$(eval $(call gb_ExternalPackage_add_library_for_install,cairo,lib/libcairo.so.2,src/.libs/libcairo.so.2.11000.2))
+$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11000.2))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/cairo/ExternalPackage_pixman.mk b/external/cairo/ExternalPackage_pixman.mk
index 0e342c8265dd..ee3bf1139da8 100644
--- a/external/cairo/ExternalPackage_pixman.mk
+++ b/external/cairo/ExternalPackage_pixman.mk
@@ -9,8 +9,10 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,pixman,pixman))
 
+$(eval $(call gb_ExternalPackage_set_outdir,pixman,$(INSTROOT)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman))
 
-$(eval $(call gb_ExternalPackage_add_library_for_install,pixman,lib/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4))
+$(eval $(call gb_ExternalPackage_add_file,pixman,$(LIBO_LIB_FOLDER)/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/curl/ExternalPackage_curl.mk b/external/curl/ExternalPackage_curl.mk
index 9766766fa08b..89b8699bd374 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -9,18 +9,20 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,curl,curl))
 
+$(eval $(call gb_ExternalPackage_set_outdir,curl,$(INSTROOT)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,curl,curl))
 
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS)$(COM),WNTGCC)
-$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/.libs/libcurl.dll))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.dll,lib/.libs/libcurl.dll))
 else ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/libcurl.dll))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.dll,lib/libcurl.dll))
 else ifeq ($(OS),AIX)
-$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4))
 else
-$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0))
+$(eval $(call gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.2.0))
 endif
 
 endif # $(DISABLE_DYNLOADING)
diff --git a/external/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk
index bc37b398926c..882544c19b7c 100644
--- a/external/firebird/ExternalPackage_firebird.mk
+++ b/external/firebird/ExternalPackage_firebird.mk
@@ -9,14 +9,16 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,firebird,firebird))
 
+$(eval $(call gb_ExternalPackage_set_outdir,firebird,$(INSTROOT)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird))
 
 ifeq ($(OS)-$(COM),WNT-MSC)
-$(eval $(call gb_ExternalPackage_add_library_for_install,firebird,bin/ifbembed.dll,gen/firebird/bin/ifbembed.dll))
+$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/ifbembed.dll,gen/firebird/bin/ifbembed.dll))
 else ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2))
+$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2))
 else
-$(eval $(call gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.2))
+$(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.2))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/icu/ExternalPackage_icu.mk b/external/icu/ExternalPackage_icu.mk
index c5ff8266f3d4..0ba76dc6da82 100644
--- a/external/icu/ExternalPackage_icu.mk
+++ b/external/icu/ExternalPackage_icu.mk
@@ -11,19 +11,21 @@ icu_VERSION := $(ICU_MAJOR).$(ICU_MINOR)$(if $(ICU_MICRO),.$(ICU_MICRO))
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,icu,icu))
 
+$(eval $(call gb_ExternalPackage_set_outdir,icu,$(INSTROOT)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,icu,icu))
 
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 ifeq ($(OS),WNT)
 
 ifeq ($(COM),GCC)
-$(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\
+$(eval $(call gb_ExternalPackage_add_files,icu,$(LIBO_LIB_FOLDER),\
 	source/lib/icudt$(ICU_MAJOR).dll \
 	source/lib/icuuc$(ICU_MAJOR).dll \
 	source/lib/icuin$(ICU_MAJOR).dll \
 ))
 else
-$(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\
+$(eval $(call gb_ExternalPackage_add_files,icu,$(LIBO_LIB_FOLDER),\
 	source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
 	source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
 	source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
@@ -32,7 +34,7 @@ endif # $(COM)
 
 else ifeq ($(OS),ANDROID)
 
-$(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,lib,\
+$(eval $(call gb_ExternalPackage_add_files,icu,$(LIBO_LIB_FOLDER),\
 	source/lib/libicudatalo.so \
 	source/lib/libicuuclo.so \
 	source/lib/libicui18nlo.so \
@@ -40,9 +42,9 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,lib,\
 
 else # $(OS) != WNT/ANDROID
 
-$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION)))
-$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION)))
-$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)))
+$(eval $(call gb_ExternalPackage_add_file,icu,$(LIBO_LIB_FOLDER)/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION)))
+$(eval $(call gb_ExternalPackage_add_file,icu,$(LIBO_LIB_FOLDER)/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION)))
+$(eval $(call gb_ExternalPackage_add_file,icu,$(LIBO_LIB_FOLDER)/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)))
 
 endif # $(OS)
 endif # DISABLE_DYNLOADING
diff --git a/external/lcms2/ExternalPackage_lcms2.mk b/external/lcms2/ExternalPackage_lcms2.mk
index 4d1c98e414db..294347f171be 100644
--- a/external/lcms2/ExternalPackage_lcms2.mk
+++ b/external/lcms2/ExternalPackage_lcms2.mk
@@ -9,21 +9,23 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,lcms2,lcms2))
 
+$(eval $(call gb_ExternalPackage_set_outdir,lcms2,$(INSTROOT)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2))
 
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib))
+$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib))
 else ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
-$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/liblcms2-2.dll,src/.libs/liblcms2-2.dll))
+$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2-2.dll,src/.libs/liblcms2-2.dll))
 else ifeq ($(COM),MSC)
 # note: the lcms2d.lib references LCMS2.DLL (without D!) but the dll is
 # actually called LCMS2D.DLL then
-$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/lcms2.dll,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
+$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/lcms2.dll,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
 endif # $(COM)
 else  # $(OS) != WNT/MACOSX
-$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2.0.4))
+$(eval $(call gb_ExternalPackage_add_file,lcms2,$(LIBO_LIB_FOLDER)/liblcms2.so.2,src/.libs/liblcms2.so.2.0.4))
 endif # $(OS)
 endif # $(DISABLE_DYNLOADING)
 
diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk
index 69a6e886dfb6..7102dfdf70ff 100644
--- a/external/libxml2/ExternalPackage_xml2.mk
+++ b/external/libxml2/ExternalPackage_xml2.mk
@@ -9,19 +9,21 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,xml2,xml2))
 
+$(eval $(call gb_ExternalPackage_set_outdir,xml2,$(INSTROOT)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,xml2,xml2))
 
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.2.dylib,.libs/libxml2.2.dylib,xml2))
+$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.2.dylib,.libs/libxml2.2.dylib))
 else ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
-$(eval $(call gb_ExternalPackage_add_library_for_install,xml2,bin/libxml2.dll,.libs/libxml2.dll,xml2))
+$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,.libs/libxml2.dll))
 else # COM=MSC
-$(eval $(call gb_ExternalPackage_add_library_for_install,xml2,bin/libxml2.dll,win32/bin.msvc/libxml2.dll,xml2))
+$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
 endif
 else # OS!=WNT
-$(eval $(call gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.so.2,.libs/libxml2.so.2.7.6,xml2))
+$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.7.6))
 endif
 endif # DISABLE_DYNLOADING
 
diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk
index d645ed3640c6..6933e35a74bf 100644
--- a/external/libxslt/ExternalPackage_xslt.mk
+++ b/external/libxslt/ExternalPackage_xslt.mk
@@ -9,23 +9,25 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,xslt,xslt))
 
+$(eval $(call gb_ExternalPackage_set_outdir,xslt,$(INSTROOT)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,xslt,xslt))
 
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.1.dylib,libxslt/.libs/libxslt.1.dylib))
-$(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.0.dylib,libexslt/.libs/libexslt.0.dylib))
+$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.1.dylib,libxslt/.libs/libxslt.1.dylib))
+$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.0.dylib,libexslt/.libs/libexslt.0.dylib))
 else ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
-$(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libxslt.dll,libxslt/.libs/libxslt.dll))
-$(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libexslt.dll,libexslt/.libs/libexslt.dll))
+$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.dll,libxslt/.libs/libxslt.dll))
+$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.dll,libexslt/.libs/libexslt.dll))
 else # COM=MSC
-$(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libxslt.dll,win32/bin.msvc/libxslt.dll))
-$(eval $(call gb_ExternalPackage_add_library_for_install,xslt,bin/libexslt.dll,win32/bin.msvc/libexslt.dll))
+$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.dll,win32/bin.msvc/libxslt.dll))
+$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.dll,win32/bin.msvc/libexslt.dll))
 endif
 else # OS!=WNT
-$(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.26))
-$(eval $(call gb_ExternalPackage_add_library_for_install,xslt,lib/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.15))
+$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.26))
+$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.15))
 endif
 endif # DISABLE_DYNLOADING
 
diff --git a/external/lpsolve/ExternalPackage_lpsolve.mk b/external/lpsolve/ExternalPackage_lpsolve.mk
index 663b247abf9e..bd2715ad7a19 100644
--- a/external/lpsolve/ExternalPackage_lpsolve.mk
+++ b/external/lpsolve/ExternalPackage_lpsolve.mk
@@ -9,15 +9,17 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,lpsolve,lpsolve))
 
+$(eval $(call gb_ExternalPackage_set_outdir,lpsolve,$(INSTROOT)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,lpsolve,lpsolve))
 
 ifneq ($(DISABLE_DYNLOADING),TRUE)
 ifeq ($(OS),WNT)
-$(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,bin/lpsolve55.dll,lpsolve55/lpsolve55.dll))
+$(eval $(call gb_ExternalPackage_add_file,lpsolve,$(LIBO_LIB_FOLDER)/lpsolve55.dll,lpsolve55/lpsolve55.dll))
 else ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,lib/liblpsolve55.dylib,lpsolve55/liblpsolve55.dylib))
+$(eval $(call gb_ExternalPackage_add_file,lpsolve,$(LIBO_LIB_FOLDER)/liblpsolve55.dylib,lpsolve55/liblpsolve55.dylib))
 else # $(OS) != WNT/MACOSX
-$(eval $(call gb_ExternalPackage_add_library_for_install,lpsolve,lib/liblpsolve55.so,lpsolve55/liblpsolve55.so))
+$(eval $(call gb_ExternalPackage_add_file,lpsolve,$(LIBO_LIB_FOLDER)/liblpsolve55.so,lpsolve55/liblpsolve55.so))
 endif # $(OS)
 endif # $(DISABLE_DYNLOADING)
 
diff --git a/libxmlsec/ExternalPackage_xmlsec.mk b/libxmlsec/ExternalPackage_xmlsec.mk
index 0655e9716ceb..c3c517040b31 100644
--- a/libxmlsec/ExternalPackage_xmlsec.mk
+++ b/libxmlsec/ExternalPackage_xmlsec.mk
@@ -9,15 +9,17 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,xmlsec,xmlsec))
 
+$(eval $(call gb_ExternalPackage_set_outdir,xmlsec,$(INSTROOT)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,xmlsec,xmlsec))
 
 ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
-$(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,lib/libxmlsec1.dll,src/.libs/libxmlsec1.dll))
-$(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,lib/libxmlsec1-nss.dll,src/nss/.libs/libxmlsec1-nss.dll))
+$(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec1.dll,src/.libs/libxmlsec1.dll))
+$(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec1-nss.dll,src/nss/.libs/libxmlsec1-nss.dll))
 else
-$(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,bin/libxmlsec-mscrypto.dll,win32/binaries/libxmlsec-mscrypto.dll))
-$(eval $(call gb_ExternalPackage_add_library_for_install,xmlsec,bin/libxmlsec.dll,win32/binaries/libxmlsec.dll))
+$(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec-mscrypto.dll,win32/binaries/libxmlsec-mscrypto.dll))
+$(eval $(call gb_ExternalPackage_add_file,xmlsec,$(LIBO_LIB_FOLDER)/libxmlsec.dll,win32/binaries/libxmlsec.dll))
 endif
 endif
 
diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk
index e4323ea20109..664f8ac25870 100644
--- a/nss/ExternalPackage_nss.mk
+++ b/nss/ExternalPackage_nss.mk
@@ -9,10 +9,12 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,nss,nss))
 
+$(eval $(call gb_ExternalPackage_set_outdir,nss,$(INSTROOT)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,nss,nss))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\
+$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
 		mozilla/dist/out/lib/libfreebl3.dylib \
 		mozilla/dist/out/lib/libnspr4.dylib \
 		mozilla/dist/out/lib/libnss3.dylib \
@@ -26,7 +28,7 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\
 		mozilla/dist/out/lib/libssl3.dylib \
 ))
 else ifeq ($(OS),WNT)
-$(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,bin,\
+$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
 		mozilla/dist/out/lib/freebl3.dll \
 		mozilla/dist/out/lib/nspr4.dll \
 		mozilla/dist/out/lib/nss3.dll \
@@ -41,7 +43,7 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,bin,\
 		mozilla/dist/out/lib/ssl3.dll \
 ))
 else # OS!=WNT/MACOSX
-$(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\
+$(eval $(call gb_ExternalPackage_add_files,nss,$(LIBO_LIB_FOLDER),\
 		mozilla/dist/out/lib/libfreebl3.so \
 		mozilla/dist/out/lib/libnspr4.so \
 		mozilla/dist/out/lib/libnss3.so \
diff --git a/openssl/ExternalPackage_openssl.mk b/openssl/ExternalPackage_openssl.mk
index df837ae4d11b..37a2a735a998 100644
--- a/openssl/ExternalPackage_openssl.mk
+++ b/openssl/ExternalPackage_openssl.mk
@@ -9,10 +9,12 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,openssl,openssl))
 
+$(eval $(call gb_ExternalPackage_set_outdir,openssl,$(INSTROOT)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,openssl,openssl))
 
 ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_libraries_for_install,openssl,bin,\
+$(eval $(call gb_ExternalPackage_add_files,openssl,$(LIBO_LIB_FOLDER),\
 	out32dll/ssleay32.dll \
 	out32dll/libeay32.dll \
 ))
diff --git a/redland/ExternalPackage_raptor.mk b/redland/ExternalPackage_raptor.mk
index 1382e4f1a0d9..53bcfe4ea312 100644
--- a/redland/ExternalPackage_raptor.mk
+++ b/redland/ExternalPackage_raptor.mk
@@ -9,16 +9,18 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,raptor,raptor))
 
+$(eval $(call gb_ExternalPackage_set_outdir,raptor,$(INSTROOT)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,raptor,raptor))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_library_for_install,raptor,lib/libraptor2-lo.$(RAPTOR_MAJOR).dylib,src/.libs/libraptor2-lo.$(RAPTOR_MAJOR).dylib))
+$(eval $(call gb_ExternalPackage_add_file,raptor,$(LIBO_LIB_FOLDER)/libraptor2-lo.$(RAPTOR_MAJOR).dylib,src/.libs/libraptor2-lo.$(RAPTOR_MAJOR).dylib))
 else ifeq ($(OS)-$(COM),WNT-GCC)
-$(eval $(call gb_ExternalPackage_add_library_for_install,raptor,bin/libraptor2-$(RAPTOR_MAJOR).dll,src/.libs/libraptor2-$(RAPTOR_MAJOR).dll))
+$(eval $(call gb_ExternalPackage_add_file,raptor,$(LIBO_LIB_FOLDER)/libraptor2-$(RAPTOR_MAJOR).dll,src/.libs/libraptor2-$(RAPTOR_MAJOR).dll))
 else ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_library_for_install,raptor,bin/libraptor2.dll,src/.libs/libraptor2.dll))
+$(eval $(call gb_ExternalPackage_add_file,raptor,$(LIBO_LIB_FOLDER)/libraptor2.dll,src/.libs/libraptor2.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_library_for_install,raptor,lib/libraptor2-lo.so.$(RAPTOR_MAJOR),src/.libs/libraptor2-lo.so.$(RAPTOR_MAJOR).0.0))
+$(eval $(call gb_ExternalPackage_add_file,raptor,$(LIBO_LIB_FOLDER)/libraptor2-lo.so.$(RAPTOR_MAJOR),src/.libs/libraptor2-lo.so.$(RAPTOR_MAJOR).0.0))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalPackage_rasqal.mk b/redland/ExternalPackage_rasqal.mk
index d5d2651d30e1..043a8ae5fdd8 100644
--- a/redland/ExternalPackage_rasqal.mk
+++ b/redland/ExternalPackage_rasqal.mk
@@ -9,16 +9,18 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,rasqal,rasqal))
 
+$(eval $(call gb_ExternalPackage_set_outdir,rasqal,$(INSTROOT)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,rasqal,rasqal))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_library_for_install,rasqal,lib/librasqal-lo.$(RASQAL_MAJOR).dylib,src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib))
+$(eval $(call gb_ExternalPackage_add_file,rasqal,$(LIBO_LIB_FOLDER)/librasqal-lo.$(RASQAL_MAJOR).dylib,src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib))
 else ifeq ($(OS)-$(COM),WNT-GCC)
-$(eval $(call gb_ExternalPackage_add_library_for_install,rasqal,bin/librasqal-$(RASQAL_MAJOR).dll,src/.libs/librasqal-$(RASQAL_MAJOR).dll))
+$(eval $(call gb_ExternalPackage_add_file,rasqal,$(LIBO_LIB_FOLDER)/librasqal-$(RASQAL_MAJOR).dll,src/.libs/librasqal-$(RASQAL_MAJOR).dll))
 else ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_library_for_install,rasqal,bin/librasqal.dll,src/.libs/librasqal.dll))
+$(eval $(call gb_ExternalPackage_add_file,rasqal,$(LIBO_LIB_FOLDER)/librasqal.dll,src/.libs/librasqal.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_library_for_install,rasqal,lib/librasqal-lo.so.$(RASQAL_MAJOR),src/.libs/librasqal-lo.so.$(RASQAL_MAJOR).0.0))
+$(eval $(call gb_ExternalPackage_add_file,rasqal,$(LIBO_LIB_FOLDER)/librasqal-lo.so.$(RASQAL_MAJOR),src/.libs/librasqal-lo.so.$(RASQAL_MAJOR).0.0))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalPackage_redland.mk b/redland/ExternalPackage_redland.mk
index 83c2f8bf4eb0..ee241fb27aff 100644
--- a/redland/ExternalPackage_redland.mk
+++ b/redland/ExternalPackage_redland.mk
@@ -9,16 +9,18 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,redland,redland))
 
+$(eval $(call gb_ExternalPackage_set_outdir,redland,$(INSTROOT)))
+
 $(eval $(call gb_ExternalPackage_use_external_project,redland,redland))
 
 ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_library_for_install,redland,lib/librdf-lo.$(REDLAND_MAJOR).dylib,src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib))
+$(eval $(call gb_ExternalPackage_add_file,redland,$(LIBO_LIB_FOLDER)/librdf-lo.$(REDLAND_MAJOR).dylib,src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib))
 else ifeq ($(OS)-$(COM),WNT-GCC)
-$(eval $(call gb_ExternalPackage_add_library_for_install,redland,bin/librdf-$(REDLAND_MAJOR).dll,src/.libs/librdf-$(REDLAND_MAJOR).dll))
+$(eval $(call gb_ExternalPackage_add_file,redland,$(LIBO_LIB_FOLDER)/librdf-$(REDLAND_MAJOR).dll,src/.libs/librdf-$(REDLAND_MAJOR).dll))
 else ifeq ($(COM),MSC)
-$(eval $(call gb_ExternalPackage_add_library_for_install,redland,bin/librdf.dll,src/.libs/librdf.dll))
+$(eval $(call gb_ExternalPackage_add_file,redland,$(LIBO_LIB_FOLDER)/librdf.dll,src/.libs/librdf.dll))
 else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_library_for_install,redland,lib/librdf-lo.so.$(REDLAND_MAJOR),src/.libs/librdf-lo.so.$(REDLAND_MAJOR).0.0))
+$(eval $(call gb_ExternalPackage_add_file,redland,$(LIBO_LIB_FOLDER)/librdf-lo.so.$(REDLAND_MAJOR),src/.libs/librdf-lo.so.$(REDLAND_MAJOR).0.0))
 endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index ad5697d4a5c8..21ea69320f7d 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -113,6 +113,7 @@ endef
 #
 # gb_ExternalPackage_add_file package dest src
 define gb_ExternalPackage_add_file
+$(if $(4),$(call gb_Output_error,gb_ExternalPackage_add_file: $(1) 4: $(4)))
 $(call gb_ExternalPackage_mark_generated_file,$(1),$(3))
 $(call gb_Package_add_file,$(1),$(2),$(3))
 
@@ -194,40 +195,4 @@ gb_ExternalPackage_PROJECT_$(1) := $(2)
 
 endef
 
-# gb_ExternalPackage__add_file_for_install package dest dest-inst src
-define gb_ExternalPackage__add_file_for_install
-$(call gb_ExternalPackage_add_file,$(1),$(2),$(4))
-
-$(call gb_Helper_install,$(call gb_Package_get_target,$(1)), \
-	$(3), \
-	$(call gb_UnpackedTarball_get_dir,$(gb_ExternalPackage_UNPACKED_$(1)))/$(4))
-
-$(call gb_UnpackedTarball_get_dir,$(gb_ExternalPackage_UNPACKED_$(1)))/$(4) :| \
-	$(call gb_Package_get_preparation_target,$(1))
-
-endef
-
-# Add a (dynamic) library that is a part of the installation.
-#
-# This function is very similar to gb_ExternalPackage_add_file, except
-# that it also allows to deliver the library to its proper place in
-# $(INSTROOT).
-#
-# The last argument is the name under which the library was registered.
-# It is used to determine layer, if the library is not in layer OOO.
-#
-# gb_ExternalPackage_add_library_for_install package dest src library?
-define gb_ExternalPackage_add_library_for_install
-$(call gb_ExternalPackage__add_file_for_install,$(1),$(2),$(if $(4),$(call gb_Library_get_instdir,$(4)),$(INSTROOT)/$(LIBO_LIB_FOLDER))/$(notdir $(2)),$(3))
-
-endef
-
-# Add several libraries for install at once.
-#
-# gb_ExternalPackage_add_libraries_for_install package destdir file(s)
-define gb_ExternalPackage_add_libraries_for_install
-$(foreach file,$(3),$(call gb_ExternalPackage_add_library_for_install,$(1),$(2)/$(notdir $(file)),$(file)))
-
-endef
-
 # vim: set noet sw=4 ts=4: