diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-23 21:18:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-24 00:24:12 +0200 |
| commit | 2793c546dc3bb1ea0f187bd79b33f77fd3df5afb (patch) | |
| tree | f0f3b6eb9c6ab35297bdb866320828c40c6e4c8d /redland/ExternalPackage_raptor.mk | |
| parent | 0f803f73f938087424eb3aa5f870e70b1c249d73 (diff) | |
redland: use libraries from WORKDIR
Change-Id: Ief9a38cbef7552e94ce4ad01fa363a29654bdf9e
Diffstat (limited to 'redland/ExternalPackage_raptor.mk')
| -rw-r--r-- | redland/ExternalPackage_raptor.mk | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/redland/ExternalPackage_raptor.mk b/redland/ExternalPackage_raptor.mk index ee9cfb12757c..1382e4f1a0d9 100644 --- a/redland/ExternalPackage_raptor.mk +++ b/redland/ExternalPackage_raptor.mk @@ -13,18 +13,12 @@ $(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,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)) +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)) -else ifneq ($(filter WNT,$(OS)),) -$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.a,src/.libs/libraptor2.a)) +else ifeq ($(COM),MSC) $(eval $(call gb_ExternalPackage_add_library_for_install,raptor,bin/libraptor2.dll,src/.libs/libraptor2.dll)) -else +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,lib/libraptor2.so,src/.libs/libraptor2-lo.so.$(RAPTOR_MAJOR).0.0)) endif # vim: set noet sw=4 ts=4: |