gbuild: remove gb_ExternalPackage_add_library_for_install

Deliver all external libraries to INSTDIR directly.

Change-Id: I8d3e035e5cfa07bd0f53ee4a226c48d4b86a4032

3 files changed, 18 insertions, 12 deletions

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: