diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-24 01:12:45 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-24 01:39:52 +0200 |
| commit | 33b1750f4ae8a9bc26f29440726c24f551041d94 (patch) | |
| tree | 4936ad4882a4a26e357fb46f15061ac3ed9fa803 /connectivity/Library_dbtools.mk | |
| parent | e155a555c97db9e3f54d7500f912fe88f634dc99 (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: I536376303de5330addd2dbf85bdfea8b9a23301c
Diffstat (limited to 'connectivity/Library_dbtools.mk')
| -rw-r--r-- | connectivity/Library_dbtools.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 4a26a318384c..c82e568e780d 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)) |