[Libreoffice-commits] core.git: 2 commits - solenv/gbuild svx/Library_svxcore.mk

[David Tardon]

 solenv/gbuild/Library.mk    |    1 +
 solenv/gbuild/LinkTarget.mk |   11 +++++++++++
 svx/Library_svxcore.mk      |    5 +++--
 3 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 604bdac5b1a55066133f53b8cdc19f3e2dd7ed94
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 14 10:31:27 2013 +0200

    gbuild: allow to depend on headers of a library
    
    ... even if we do not link with it. This was previously solved by
    delivering the headers to solver and depending on the Package.
    
    Change-Id: Id1b53b88d54226cb3ce02f5f2424632596fa069a

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index e7953c8..cee2d67 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -260,6 +260,7 @@ $(eval $(foreach method,\
 	use_package \
 	use_packages \
 	use_unpacked \
+	use_headers \
 	add_package_headers \
 	add_sdi_headers \
 	set_precompiled_header \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index d0d02e7..f47c8b1 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1371,6 +1371,17 @@ $(call gb_LinkTarget_get_external_headers_target,$(1)) :| $(call gb_ExternalProj
 
 endef
 
+# Use headers provided by another link target.
+#
+# This function should only be needed to enforce correct build ordering,
+# if the link target does not use the other link target.
+#
+# gb_LinkTarget_use_headers linktarget other-linktarget(s)
+define gb_LinkTarget_use_headers
+$(call gb_LinkTarget_get_external_headers_target,$(1)) :\
+    $(foreach linktarget,$(2),$(call gb_LinkTarget_get_headers_target,$(linktarget)))
+
+endef
 
 # this forwards to functions that must be defined in RepositoryExternal.mk.
 # $(eval $(call gb_LinkTarget_use_external,library,external))
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index d618861..802c056 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -378,6 +378,10 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
 
 ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
 
+$(eval $(call gb_Library_use_headers,svxcore,\
+	dbtools \
+))
+
 $(eval $(call gb_Library_add_exception_objects,svxcore,\
     svx/source/fmcomp/dbaexchange \
     svx/source/fmcomp/fmgridcl \
commit 28abf5db1360a2b1b26e05871f6a52da4a24efea
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 14 10:30:56 2013 +0200

    gbuild: Package connectivity_generated is gone
    
    Change-Id: I3471e83cccb84590d2ab154f086015d59730bd43

diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index e23ae2c..d618861 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -377,9 +377,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
 ))
 
 ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
-$(eval $(call gb_Library_use_packages,svxcore,\
-	connectivity_generated \
-))
 
 $(eval $(call gb_Library_add_exception_objects,svxcore,\
     svx/source/fmcomp/dbaexchange \