[Libreoffice-commits] .: connectivity/Library_dbtools.mk connectivity/Package_inc.mk solenv/gbuild svx/Library_svx.mk

[Libreoffice Gerrit user]

 connectivity/Library_dbtools.mk |    4 ----
 connectivity/Package_inc.mk     |    3 +++
 solenv/gbuild/LinkTarget.mk     |    2 +-
 svx/Library_svx.mk              |    1 -
 4 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 33b1750f4ae8a9bc26f29440726c24f551041d94
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Fri Aug 24 01:12:45 2012 +0200

    fdo#53888: svx: do not link against dbtools
    
    dbtools were added in 01089138cc76f5717244bd04f25a868602aeaab6 only to
    create dependency and fix the build.
    This creates circular dependency for libmerged, dbtools is not that
    common library.
    It's better to create real dependency in connectivity_inc package.
    To avoid another circular dependency gb_YaccTarget_get_header_target
    must not depend on external headers target.
    
    Change-Id: I536376303de5330addd2dbf85bdfea8b9a23301c

diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 4a26a31..c82e568 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,dbtools))
 
-# connectivity_generated causes cyclic dependency here, so set include path
-# for that instead
 $(eval $(call gb_Library_use_packages,dbtools,\
 	connectivity_inc \
 ))
@@ -42,9 +40,7 @@ $(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/d
 
 $(eval $(call gb_Library_set_include,dbtools,\
 	$$(INCLUDE) \
-	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
-	-I$(dir $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)) \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,dbtools))
diff --git a/connectivity/Package_inc.mk b/connectivity/Package_inc.mk
index 6c2b42d..bbf5fbb 100644
--- a/connectivity/Package_inc.mk
+++ b/connectivity/Package_inc.mk
@@ -27,6 +27,9 @@
 
 $(eval $(call gb_Package_Package,connectivity_inc,$(SRCDIR)/connectivity/inc/connectivity))
 
+# sqlbison.hxx is generated and thus in another package
+$(call gb_Package_get_target,connectivity_inc) : $(call gb_Package_get_target,connectivity_generated)
+
 $(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/BlobHelper.hxx,BlobHelper.hxx))
 $(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/CommonTools.hxx,CommonTools.hxx))
 $(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/conncleanup.hxx,conncleanup.hxx))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 7745316..826a820 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -893,7 +893,7 @@ define gb_LinkTarget_add_grammar
 $(call gb_YaccTarget_YaccTarget,$(2))
 $(call gb_LinkTarget_add_generated_exception_object,$(1),YaccTarget/$(2),$(3))
 $(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_YaccTarget_get_clean_target,$(2))
-$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_YaccTarget_get_header_target,$(2)))
+$(call gb_LinkTarget_get_headers_target,$(1)) : $(call gb_YaccTarget_get_header_target,$(2))
 $(call gb_LinkTarget__add_include,$(1),$(dir $(call gb_YaccTarget_get_header_target,$(2))))
 
 endef
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index fe3cba3..a26c1c3 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_Library_use_libraries,svx,\
     comphelper \
     cppuhelper \
     cppu \
-    dbtools \
     drawinglayer \
     editeng \
     i18nisolang1 \