[Libreoffice-commits] .: 2 commits - RepositoryExternal.mk solenv/gbuild

[David Tardon]

 RepositoryExternal.mk          |   24 ++++++++++++++++++++----
 solenv/gbuild/StaticLibrary.mk |    2 ++
 2 files changed, 22 insertions(+), 4 deletions(-)

New commits:
commit 27a4e0dc8e1aa8f7445844ee7d5a9640868a9c1c
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Aug 2 07:11:52 2011 +0200

    Allow static libs to declare externals use (for includes)

diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 33aa40a..d022496 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -106,6 +106,8 @@ $(eval $(foreach method,\
 	set_library_path_flags \
 	add_linked_libs \
 	add_linked_static_libs \
+	use_external \
+	use_externals \
 	add_package_headers \
 	add_sdi_headers \
 	add_precompiled_header \
commit 17145cbc02b372e5e13dfa4920c26c57509eea1e
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Aug 2 07:10:30 2011 +0200

    Proper handling of system libvisio, wpd, wpg, wps

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index cf0e6a8..2a66f73 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -441,7 +441,11 @@ endif # SYSTEM_OPENSSL
 ifeq ($(SYSTEM_LIBVISIO),YES)
 
 define gb_LinkTarget__use_visio
-$(call gb_LinkTarget_add_libs,$(1),-llibvisio)
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+    $(LIBVISIO_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBVISIO_LIBS))
 
 endef
 
@@ -464,7 +468,11 @@ endif # SYSTEM_LIBVISIO
 ifeq ($(SYSTEM_LIBWPD),YES)
 
 define gb_LinkTarget__use_wpd
-$(call gb_LinkTarget_add_libs,$(1),-llibwpd)
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+    $(LIBWPD_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBWPD_LIBS))
 
 endef
 
@@ -487,7 +495,11 @@ endif # SYSTEM_LIBWPD
 ifeq ($(SYSTEM_LIBWPG),YES)
 
 define gb_LinkTarget__use_wpg
-$(call gb_LinkTarget_add_libs,$(1),-llibwpg)
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+    $(LIBWPG_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBWPG_LIBS))
 
 endef
 
@@ -510,7 +522,11 @@ endif # SYSTEM_LIBWPG
 ifeq ($(SYSTEM_LIBWPS),YES)
 
 define gb_LinkTarget__use_wps
-$(call gb_LinkTarget_add_libs,$(1),-llibwps)
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+    $(LIBWPS_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBWPS_LIBS))
 
 endef