connectivity: fix circular deps

connectivity/Library_ado.mk

@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,ado))
 
-$(eval $(call gb_Library_add_package_headers,ado,connectivity_inc))
-
 $(eval $(call gb_Library_set_componentfile,ado,connectivity/source/drivers/ado/ado))
 
 $(eval $(call gb_Library_add_api,ado,\

connectivity/Library_calc.mk

@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,calc))
 
-$(eval $(call gb_Library_add_package_headers,calc,connectivity_inc))
-
 $(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc))
 
 $(eval $(call gb_Library_add_api,calc,\
@@ -38,7 +36,9 @@ $(eval $(call gb_Library_add_api,calc,\
 
 $(eval $(call gb_Library_set_include,calc,\
 	$$(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_add_linked_libs,calc,\

connectivity/Library_dbpool2.mk

@@ -29,10 +29,9 @@ $(eval $(call gb_Library_Library,dbpool2))
 
 $(eval $(call gb_Library_set_componentfile,dbpool2,connectivity/source/cpool/dbpool2))
 
-$(eval $(call gb_Library_add_package_headers,dbpool2,connectivity_inc))
-
 $(eval $(call gb_Library_set_include,dbpool2,\
 	$$(INCLUDE) \
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 

connectivity/Library_dbtools.mk

@@ -32,12 +32,11 @@ $(eval $(call gb_Library_add_defs,dbtools,\
 	-DBOOST_SPIRIT_USE_OLD_NAMESPACE \
 ))
 
-$(eval $(call gb_Library_add_package_headers,dbtools,connectivity_inc))
-
 $(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/dbtools))
 
 $(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)) \
 ))

connectivity/Library_evoab2.mk

@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,evoab2))
 
-$(eval $(call gb_Library_add_package_headers,evoab2,connectivity_inc))
-
 $(eval $(call gb_Library_use_externals,evoab2,\
 	gtk \
 	gobject \

connectivity/Library_kab1.mk

@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,kab1))
 
-$(eval $(call gb_Library_add_package_headers,kab1,connectivity_inc))
-
 $(eval $(call gb_Library_use_externals,kab1,kde))
 
 $(eval $(call gb_Library_set_componentfile,kab1,connectivity/source/drivers/kab/kab1))

connectivity/Library_kabdrv1.mk

@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,kabdrv1))
 
-$(eval $(call gb_Library_add_package_headers,kabdrv1,connectivity_inc))
-
 $(eval $(call gb_Library_add_api,kabdrv1,\
 	offapi \
 	udkapi \

connectivity/Library_macab1.mk

@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,macab1))
 
-$(eval $(call gb_Library_add_package_headers,macab1,connectivity_inc))
-
 $(eval $(call gb_Library_set_componentfile,macab1,connectivity/source/drivers/macab/macab1))
 
 $(eval $(call gb_Library_add_api,macab1,\

connectivity/Library_macabdrv1.mk

@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,macabdrv1))
 
-$(eval $(call gb_Library_add_package_headers,macabdrv1,connectivity_inc))
-
 $(eval $(call gb_Library_add_api,macabdrv1,\
 	offapi \
 	udkapi \

connectivity/Library_odbc.mk

@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,odbc))
 
-$(eval $(call gb_Library_add_package_headers,odbc,connectivity_inc))
-
 $(eval $(call gb_Library_set_componentfile,odbc,connectivity/source/drivers/odbc/odbc))
 
 $(eval $(call gb_Library_add_api,odbc,\
@@ -38,6 +36,7 @@ $(eval $(call gb_Library_add_api,odbc,\
 
 $(eval $(call gb_Library_set_include,odbc,\
 	$$(INCLUDE) \
+	-I$(SRCDIR)/connectivity/inc \
 	-I$(SRCDIR)/connectivity/source/inc \
 ))
 

connectivity/Library_odbcbase.mk

@@ -27,9 +27,6 @@
 
 $(eval $(call gb_Library_Library,odbcbase))
 
-$(eval $(call gb_Library_add_package_headers,odbcbase,connectivity_inc))
-
-
 $(eval $(call gb_Library_add_api,odbcbase,\
 	offapi \
 	udkapi \
@@ -37,7 +34,9 @@ $(eval $(call gb_Library_add_api,odbcbase,\
 
 $(eval $(call gb_Library_set_include,odbcbase,\
 	$$(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_add_defs,odbcbase,\

connectivity/Library_sdbc2.mk

@@ -27,8 +27,6 @@
 
 $(eval $(call gb_Library_Library,sdbc2))
 
-$(eval $(call gb_Library_add_package_headers,sdbc2,connectivity_inc))
-
 $(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdbc2))
 
 
@@ -37,6 +35,11 @@ $(eval $(call gb_Library_add_api,sdbc2,\
 	udkapi \
 ))
 
+$(eval $(call gb_Library_set_include,sdbc2,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/connectivity/inc \
+))
+
 $(eval $(call gb_Library_add_linked_libs,sdbc2,\
 	cppu \
 	cppuhelper \