diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-24 01:12:45 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-08-29 19:54:43 +0000 |
| commit | fecf5af339506df7003a2e8f1742b1f958b6186b (patch) | |
| tree | 59d8d27c774f0dcd3207cd0c89e5ffa2c9e4dfac | |
| parent | 872d81eabe8712256c4ff3466a126cdade6d1b2a (diff) | |
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: I431513d0b7a895b471eeec854b3b3f1fd69503af
Reviewed-on: https://gerrit.libreoffice.org/470
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
| -rw-r--r-- | connectivity/Library_dbtools.mk | 4 | ||||
| -rw-r--r-- | connectivity/Package_inc.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 2 | ||||
| -rw-r--r-- | svx/Library_svx.mk | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 7688ef47a59e..b845884590ab 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_api,dbtools,\ diff --git a/connectivity/Package_inc.mk b/connectivity/Package_inc.mk index 3325e604d55d..2ce920cda39e 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 0ffc3dfd4347..ccdfe492b9f5 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -880,7 +880,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 f2bb177f8d8c..ba8ffa181b61 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -52,7 +52,6 @@ $(eval $(call gb_Library_use_libraries,svx,\ comphelper \ cppuhelper \ cppu \ - dbtools \ drawinglayer \ editeng \ i18nisolang1 \ |