diff options
| -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 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)) diff --git a/connectivity/Package_inc.mk b/connectivity/Package_inc.mk index 6c2b42d8d28e..bbf5fbb45988 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 774531656712..826a82036983 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 fe3cba3d1c6e..a26c1c38e6a7 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 \ |