diff options
author | David Tardon <dtardon@redhat.com> | 2013-05-01 11:23:50 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2013-05-01 16:55:38 +0200 |
commit | 491dea0a1fd16547a61d6045a8bfaa83e58aa93d (patch) | |
tree | e48b1598ede18cd322180685a969e3a3e6a553f6 /redland | |
parent | 61f59c46f6476a5e96fea143bc31d87c7de58ed2 (diff) |
use gb_ExternalPackage_add_runtime_library for adding libs
Change-Id: I7be80bbef306db8f7ad585e95bfa4b6da0b30067
Diffstat (limited to 'redland')
-rw-r--r-- | redland/ExternalPackage_raptor.mk | 8 | ||||
-rw-r--r-- | redland/ExternalPackage_rasqal.mk | 8 | ||||
-rw-r--r-- | redland/ExternalPackage_redland.mk | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/redland/ExternalPackage_raptor.mk b/redland/ExternalPackage_raptor.mk index 20041736c6a7..ee9cfb12757c 100644 --- a/redland/ExternalPackage_raptor.mk +++ b/redland/ExternalPackage_raptor.mk @@ -12,18 +12,18 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,raptor,raptor)) $(eval $(call gb_ExternalPackage_use_external_project,raptor,raptor)) ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2-lo.$(RAPTOR_MAJOR).dylib,src/.libs/libraptor2-lo.$(RAPTOR_MAJOR).dylib)) +$(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,lib/libraptor2.dylib,src/.libs/libraptor2-lo.$(RAPTOR_MAJOR).dylib)) else ifneq ($(filter IOS ANDROID,$(OS)),) $(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.a,src/.libs/libraptor2.a)) else ifneq ($(filter WNTGCC,$(OS)$(COM)),) $(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.dll.a,src/.libs/libraptor2.dll.a)) -$(eval $(call gb_ExternalPackage_add_file,raptor,bin/libraptor2-$(RAPTOR_MAJOR).dll,src/.libs/libraptor2-$(RAPTOR_MAJOR).dll)) +$(eval $(call gb_ExternalPackage_add_library_for_install,raptor,bin/libraptor2-$(RAPTOR_MAJOR).dll,src/.libs/libraptor2-$(RAPTOR_MAJOR).dll)) else ifneq ($(filter WNT,$(OS)),) $(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.a,src/.libs/libraptor2.a)) -$(eval $(call gb_ExternalPackage_add_file,raptor,bin/libraptor2.dll,src/.libs/libraptor2.dll)) +$(eval $(call gb_ExternalPackage_add_library_for_install,raptor,bin/libraptor2.dll,src/.libs/libraptor2.dll)) else -$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2-lo.so.$(RAPTOR_MAJOR),src/.libs/libraptor2-lo.so.$(RAPTOR_MAJOR).0.0)) +$(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,lib/libraptor2.so,src/.libs/libraptor2-lo.so.$(RAPTOR_MAJOR).0.0)) endif diff --git a/redland/ExternalPackage_rasqal.mk b/redland/ExternalPackage_rasqal.mk index 8a09bf19c885..43329b527bd8 100644 --- a/redland/ExternalPackage_rasqal.mk +++ b/redland/ExternalPackage_rasqal.mk @@ -12,18 +12,18 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,rasqal,rasqal)) $(eval $(call gb_ExternalPackage_use_external_project,rasqal,rasqal)) ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal-lo.$(RASQAL_MAJOR).dylib,src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib)) +$(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,lib/librasqal.dylib,src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib)) else ifneq ($(filter IOS ANDROID,$(OS)),) $(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.a,src/.libs/librasqal.a)) else ifneq ($(filter WNTGCC,$(OS)$(COM)),) $(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.dll.a,src/.libs/librasqal.dll.a)) -$(eval $(call gb_ExternalPackage_add_file,rasqal,bin/librasqal-$(RASQAL_MAJOR).dll,src/.libs/librasqal-$(RASQAL_MAJOR).dll)) +$(eval $(call gb_ExternalPackage_add_library_for_install,rasqal,bin/librasqal-$(RASQAL_MAJOR).dll,src/.libs/librasqal-$(RASQAL_MAJOR).dll)) else ifneq ($(filter WNT,$(OS)),) $(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.a,src/.libs/librasqal.a)) -$(eval $(call gb_ExternalPackage_add_file,rasqal,bin/librasqal.dll,src/.libs/librasqal.dll)) +$(eval $(call gb_ExternalPackage_add_library_for_install,rasqal,bin/librasqal.dll,src/.libs/librasqal.dll)) else -$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal-lo.so.$(RASQAL_MAJOR),src/.libs/librasqal-lo.so.$(RASQAL_MAJOR).0.0)) +$(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,lib/librasqal.so,src/.libs/librasqal-lo.so.$(RASQAL_MAJOR).0.0)) endif diff --git a/redland/ExternalPackage_redland.mk b/redland/ExternalPackage_redland.mk index 5cf9207e3e3b..e1c8c60c61e2 100644 --- a/redland/ExternalPackage_redland.mk +++ b/redland/ExternalPackage_redland.mk @@ -12,18 +12,18 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,redland,redland)) $(eval $(call gb_ExternalPackage_use_external_project,redland,redland)) ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf-lo.$(REDLAND_MAJOR).dylib,src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib)) +$(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,lib/librdf.dylib,src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib)) else ifneq ($(filter IOS ANDROID,$(OS)),) $(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,src/.libs/librdf.a)) else ifneq ($(filter WNTGCC,$(OS)$(COM)),) $(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.dll.a,src/.libs/librdf.dll.a)) -$(eval $(call gb_ExternalPackage_add_file,redland,bin/librdf-$(REDLAND_MAJOR).dll,src/.libs/librdf-$(REDLAND_MAJOR).dll)) +$(eval $(call gb_ExternalPackage_add_library_for_install,redland,bin/librdf-$(REDLAND_MAJOR).dll,src/.libs/librdf-$(REDLAND_MAJOR).dll)) else ifneq ($(filter WNT,$(OS)),) $(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,src/.libs/librdf.a)) -$(eval $(call gb_ExternalPackage_add_file,redland,bin/librdf.dll,src/.libs/librdf.dll)) +$(eval $(call gb_ExternalPackage_add_library_for_install,redland,bin/librdf.dll,src/.libs/librdf.dll)) else -$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf-lo.so.$(REDLAND_MAJOR),src/.libs/librdf-lo.so.$(REDLAND_MAJOR).0.0)) +$(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,lib/librdf.so,src/.libs/librdf-lo.so.$(REDLAND_MAJOR).0.0)) endif |