diff options
| -rw-r--r-- | connectivity/Library_ado.mk | 2 | ||||
| -rw-r--r-- | connectivity/Library_calc.mk | 4 | ||||
| -rw-r--r-- | connectivity/Library_dbpool2.mk | 3 | ||||
| -rw-r--r-- | connectivity/Library_dbtools.mk | 3 | ||||
| -rw-r--r-- | connectivity/Library_evoab2.mk | 2 | ||||
| -rw-r--r-- | connectivity/Library_kab1.mk | 2 | ||||
| -rw-r--r-- | connectivity/Library_kabdrv1.mk | 2 | ||||
| -rw-r--r-- | connectivity/Library_macab1.mk | 2 | ||||
| -rw-r--r-- | connectivity/Library_macabdrv1.mk | 2 | ||||
| -rw-r--r-- | connectivity/Library_odbc.mk | 3 | ||||
| -rw-r--r-- | connectivity/Library_odbcbase.mk | 5 | ||||
| -rw-r--r-- | connectivity/Library_sdbc2.mk | 7 |
12 files changed, 12 insertions, 25 deletions
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index 492a7e2a71bf..5cb183f142ec 100644 --- a/connectivity/Library_ado.mk +++ b/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,\ diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index 3fa6baa067ca..8fe95bbba221 100644 --- a/connectivity/Library_calc.mk +++ b/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,\ diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk index c2418f208551..821a2294697f 100644 --- a/connectivity/Library_dbpool2.mk +++ b/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 \ )) diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index a98fd2fbf349..223cf8d5a0f9 100644 --- a/connectivity/Library_dbtools.mk +++ b/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)) \ )) diff --git a/connectivity/Library_evoab2.mk b/connectivity/Library_evoab2.mk index 62fe736d1d11..df85d580865c 100644 --- a/connectivity/Library_evoab2.mk +++ b/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 \ diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk index c4f503c31ad0..6df1d79a9f18 100644 --- a/connectivity/Library_kab1.mk +++ b/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)) diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk index 2885ef98569a..5613cbcaaade 100644 --- a/connectivity/Library_kabdrv1.mk +++ b/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 \ diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk index 39cc46008fd7..1024764b2030 100644 --- a/connectivity/Library_macab1.mk +++ b/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,\ diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk index d69963abecf2..35827353c558 100644 --- a/connectivity/Library_macabdrv1.mk +++ b/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 \ diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index 6744bb7f6aca..ee10b8061813 100644 --- a/connectivity/Library_odbc.mk +++ b/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 \ )) diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index b41b437e77b7..b328545a0098 100644 --- a/connectivity/Library_odbcbase.mk +++ b/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,\ diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk index 59a2900a128e..59ec716bbd43 100644 --- a/connectivity/Library_sdbc2.mk +++ b/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 \ |