diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-25 22:36:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-27 00:50:02 +0200 |
| commit | 349015b18e285b9642e0b16a5e4db61ef347a6a8 (patch) | |
| tree | be3b36ba75e167cea6d13f91e26fcc596e9e2d28 /redland/ExternalPackage_raptor.mk | |
| parent | 90d7723085a8da0929c7c17587a7717ceeb23d36 (diff) | |
gbuild: remove gb_ExternalPackage_add_library_for_install
Deliver all external libraries to INSTDIR directly.
Change-Id: I8d3e035e5cfa07bd0f53ee4a226c48d4b86a4032
Diffstat (limited to 'redland/ExternalPackage_raptor.mk')
| -rw-r--r-- | redland/ExternalPackage_raptor.mk | 10 |
1 files changed, 6 insertions, 4 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: |