mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#53888: svx: do not link against dbtools

Browse Source 
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
This commit is contained in:
Matúš Kukan 2012-08-24 01:12:45 +02:00
parent e155a555c9
commit 33b1750f4a
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
connectivity/Library_dbtools.mk
View File

@ -27,8 +27,6 @@
$(eval $(call gb_Library_Library,dbtools)) $(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,\ $(eval $(call gb_Library_use_packages,dbtools,\
connectivity_inc \ connectivity_inc \
)) ))
@ -42,9 +40,7 @@ $(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/d
$(eval $(call gb_Library_set_include,dbtools,\ $(eval $(call gb_Library_set_include,dbtools,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(SRCDIR)/connectivity/inc \
-I$(SRCDIR)/connectivity/source/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)) $(eval $(call gb_Library_use_sdk_api,dbtools))

3
connectivity/Package_inc.mk
View File

@ -27,6 +27,9 @@
$(eval $(call gb_Package_Package,connectivity_inc,$(SRCDIR)/connectivity/inc/connectivity)) $(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/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/CommonTools.hxx,CommonTools.hxx))
$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/conncleanup.hxx,conncleanup.hxx)) $(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/conncleanup.hxx,conncleanup.hxx))

2
solenv/gbuild/LinkTarget.mk
View File

@ -893,7 +893,7 @@ define gb_LinkTarget_add_grammar
$(call gb_YaccTarget_YaccTarget,$(2)) $(call gb_YaccTarget_YaccTarget,$(2))
$(call gb_LinkTarget_add_generated_exception_object,$(1),YaccTarget/$(2),$(3)) $(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_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)))) $(call gb_LinkTarget__add_include,$(1),$(dir $(call gb_YaccTarget_get_header_target,$(2))))
endef endef

1
svx/Library_svx.mk
View File

@ -49,7 +49,6 @@ $(eval $(call gb_Library_use_libraries,svx,\
comphelper \ comphelper \
cppuhelper \ cppuhelper \
cppu \ cppu \
dbtools \
drawinglayer \ drawinglayer \
editeng \ editeng \
i18nisolang1 \ i18nisolang1 \