diff options
| -rw-r--r-- | RepositoryExternal.mk | 6 | ||||
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 3 | ||||
| -rw-r--r-- | redland/ExternalPackage_raptor.mk | 12 | ||||
| -rw-r--r-- | redland/ExternalPackage_rasqal.mk | 12 | ||||
| -rw-r--r-- | redland/ExternalPackage_redland.mk | 12 | ||||
| -rw-r--r-- | redland/ExternalProject_rasqal.mk | 4 | ||||
| -rw-r--r-- | redland/ExternalProject_redland.mk | 8 |
7 files changed, 21 insertions, 36 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6f1b306ac554..eee3d1e718df 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -985,9 +985,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ define gb_LinkTarget__use_librdf $(call gb_LinkTarget_use_packages,$(1),raptor rasqal redland) -$(call gb_LinkTarget_use_libraries,$(1),\ - raptor2 \ - rdf \ +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \ + -L$(call gb_UnpackedTarball_get_dir,redland)/src/.libs -lrdf \ ) endef diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index ece859421272..e1d311382159 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -97,6 +97,9 @@ LIBS = \ $(wildcard $(WORKDIR)/UnpackedTarball/libvisio/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/libwp?/src/lib/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/openssl/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/raptor/src/.libs/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/rasqal/src/.libs/*.a) \ + $(wildcard $(WORKDIR)/UnpackedTarball/redland/src/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/xml2/.libs/*.a) \ $(wildcard $(WORKDIR)/UnpackedTarball/xslt/libxslt/.libs/*.a) \ -Wl,--end-group 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: diff --git a/redland/ExternalPackage_rasqal.mk b/redland/ExternalPackage_rasqal.mk index 43329b527bd8..d5d2651d30e1 100644 --- a/redland/ExternalPackage_rasqal.mk +++ b/redland/ExternalPackage_rasqal.mk @@ -13,18 +13,12 @@ $(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,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)) +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)) -else ifneq ($(filter WNT,$(OS)),) -$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.a,src/.libs/librasqal.a)) +else ifeq ($(COM),MSC) $(eval $(call gb_ExternalPackage_add_library_for_install,rasqal,bin/librasqal.dll,src/.libs/librasqal.dll)) -else +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,lib/librasqal.so,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 e1c8c60c61e2..83c2f8bf4eb0 100644 --- a/redland/ExternalPackage_redland.mk +++ b/redland/ExternalPackage_redland.mk @@ -13,18 +13,12 @@ $(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,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)) +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)) -else ifneq ($(filter WNT,$(OS)),) -$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,src/.libs/librdf.a)) +else ifeq ($(COM),MSC) $(eval $(call gb_ExternalPackage_add_library_for_install,redland,bin/librdf.dll,src/.libs/librdf.dll)) -else +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,lib/librdf.so,src/.libs/librdf-lo.so.$(REDLAND_MAJOR).0.0)) endif # vim: set noet sw=4 ts=4: diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk index 9277d079dd0d..6d09cfebeac6 100644 --- a/redland/ExternalProject_rasqal.mk +++ b/redland/ExternalProject_rasqal.mk @@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): OBJDUMP="$(HOST_PLATFORM)-objdump" \ PKG_CONFIG="" \ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ - RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2" \ + RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2" \ ./configure --disable-static --enable-shared --disable-gtk-doc \ --disable-pcre \ --with-decimal=none \ @@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): $(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \ PKG_CONFIG="" \ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ - RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2" \ + RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2" \ ./configure --disable-gtk-doc \ --with-regex-library=posix \ --with-decimal=none \ diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk index fe911bc1bc7e..e4a98dcbe2a1 100644 --- a/redland/ExternalProject_redland.mk +++ b/redland/ExternalProject_redland.mk @@ -28,10 +28,10 @@ $(call gb_ExternalProject_get_state_target,redland,build): OBJDUMP="$(HOST_PLATFORM)-objdump" \ PKG_CONFIG="" \ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ - RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 \ + RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \ $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \ RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \ - RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \ + RASQAL_LIBS="-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal" \ ./configure --disable-static --disable-gtk-doc \ --disable-modular \ --without-threads \ @@ -51,10 +51,10 @@ $(call gb_ExternalProject_get_state_target,redland,build): CPPFLAGS="$(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ PKG_CONFIG="" \ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \ - RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 \ + RAPTOR2_LIBS="-L$(call gb_UnpackedTarball_get_dir,raptor)/src/.libs -lraptor2 \ $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-L$(call gb_UnpackedTarball_get_dir,xml2)/.libs -lxml2)" \ RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \ - RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \ + RASQAL_LIBS="-L$(call gb_UnpackedTarball_get_dir,rasqal)/src/.libs -lrasqal" \ ./configure --disable-gtk-doc \ --disable-modular \ --without-threads \ |