diff options
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/Library_ado.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_calc.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_dbase.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_dbpool2.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_dbtools.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_evoab.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_firebird_sdbc.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_flat.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_hsqldb.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_jdbc.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_macab1.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_mozbootstrap.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_mysql_jdbc.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_mysqlc.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_odbc.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_postgresql-sdbc-impl.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_postgresql-sdbc.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_sdbc2.mk | 2 | ||||
-rw-r--r-- | connectivity/Library_writer.mk | 2 | ||||
-rw-r--r-- | connectivity/Rdb_postgresql-sdbc.mk | 5 |
20 files changed, 19 insertions, 24 deletions
diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index 4886c5aa6d61..8cfd5485fe15 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Library_Library,ado)) -$(eval $(call gb_Library_set_componentfile,ado,connectivity/source/drivers/ado/ado)) +$(eval $(call gb_Library_set_componentfile,ado,connectivity/source/drivers/ado/ado,services)) $(eval $(call gb_Library_set_include,ado,\ -I$(SRCDIR)/connectivity/inc \ diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index b751ce16bfe3..925b6ec8fa49 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Library_Library,calc)) -$(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc)) +$(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc,services)) $(eval $(call gb_Library_use_external,calc,boost_headers)) diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index 1779b49cf21d..b69b25cb206e 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Library_Library,dbase)) -$(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase)) +$(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase,services)) $(eval $(call gb_Library_use_external,dbase,boost_headers)) diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk index fee4d3477087..334a225c8975 100644 --- a/connectivity/Library_dbpool2.mk +++ b/connectivity/Library_dbpool2.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Library_Library,dbpool2)) -$(eval $(call gb_Library_set_componentfile,dbpool2,connectivity/source/cpool/dbpool2)) +$(eval $(call gb_Library_set_componentfile,dbpool2,connectivity/source/cpool/dbpool2,services)) $(eval $(call gb_Library_set_include,dbpool2,\ $$(INCLUDE) \ diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 1b9f444a9ab1..f8f457e5aa35 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,dbtools,\ -DOOO_DLLIMPLEMENTATION_DBTOOLS \ )) -$(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/dbtools)) +$(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/dbtools,services)) $(eval $(call gb_Library_set_include,dbtools,\ $$(INCLUDE) \ diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 28327f060bcf..978838ca86f6 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Library_use_externals,evoab,\ gobject \ )) -$(eval $(call gb_Library_set_componentfile,evoab,connectivity/source/drivers/evoab2/evoab)) +$(eval $(call gb_Library_set_componentfile,evoab,connectivity/source/drivers/evoab2/evoab,services)) $(eval $(call gb_Library_use_sdk_api,evoab)) diff --git a/connectivity/Library_firebird_sdbc.mk b/connectivity/Library_firebird_sdbc.mk index 5fb596ef8fb4..ce0dbe6902ed 100644 --- a/connectivity/Library_firebird_sdbc.mk +++ b/connectivity/Library_firebird_sdbc.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_libraries,firebird_sdbc, \ vcl \ )) -$(eval $(call gb_Library_set_componentfile,firebird_sdbc,connectivity/source/drivers/firebird/firebird_sdbc)) +$(eval $(call gb_Library_set_componentfile,firebird_sdbc,connectivity/source/drivers/firebird/firebird_sdbc,services)) $(eval $(call gb_Library_add_exception_objects,firebird_sdbc,\ connectivity/source/drivers/firebird/Blob \ diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index 77e2dee405e2..0fdf43276034 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Library_Library,flat)) -$(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat)) +$(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat,services)) $(eval $(call gb_Library_use_external,flat,boost_headers)) diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index 3c85fc462240..40764b9237d8 100644 --- a/connectivity/Library_hsqldb.mk +++ b/connectivity/Library_hsqldb.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\ i18nlangtag \ )) -$(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb)) +$(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb,services)) $(eval $(call gb_Library_add_exception_objects,hsqldb,\ connectivity/source/drivers/hsqldb/HCatalog \ diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 396369e8fc5b..578c7013db85 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Library_Library,jdbc)) -$(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc)) +$(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc,services)) $(eval $(call gb_Library_use_external,jdbc,boost_headers)) diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk index 58eca126917a..82e3cf489b18 100644 --- a/connectivity/Library_macab1.mk +++ b/connectivity/Library_macab1.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Library_Library,macab1)) -$(eval $(call gb_Library_set_componentfile,macab1,connectivity/source/drivers/macab/macab1)) +$(eval $(call gb_Library_set_componentfile,macab1,connectivity/source/drivers/macab/macab1,services)) $(eval $(call gb_Library_use_external,macab1,boost_headers)) diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk index 237726caf8a8..dfa587fa0e7a 100644 --- a/connectivity/Library_mozbootstrap.mk +++ b/connectivity/Library_mozbootstrap.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Library_Library,mozbootstrap)) -$(eval $(call gb_Library_set_componentfile,mozbootstrap,connectivity/source/drivers/mozab/bootstrap/mozbootstrap)) +$(eval $(call gb_Library_set_componentfile,mozbootstrap,connectivity/source/drivers/mozab/bootstrap/mozbootstrap,services)) $(eval $(call gb_Library_set_include,mozbootstrap,\ -I$(SRCDIR)/connectivity/source/drivers/mozab \ diff --git a/connectivity/Library_mysql_jdbc.mk b/connectivity/Library_mysql_jdbc.mk index ce4649f88580..21317ad697da 100644 --- a/connectivity/Library_mysql_jdbc.mk +++ b/connectivity/Library_mysql_jdbc.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Library_Library,mysql_jdbc)) -$(eval $(call gb_Library_set_componentfile,mysql_jdbc,connectivity/source/drivers/mysql_jdbc/mysql_jdbc)) +$(eval $(call gb_Library_set_componentfile,mysql_jdbc,connectivity/source/drivers/mysql_jdbc/mysql_jdbc,services)) $(eval $(call gb_Library_use_external,mysql_jdbc,boost_headers)) diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk index f765fb1e305f..9cbab05bd7a7 100644 --- a/connectivity/Library_mysqlc.mk +++ b/connectivity/Library_mysqlc.mk @@ -62,6 +62,6 @@ $(eval $(call gb_Library_add_exception_objects,mysqlc,\ connectivity/source/drivers/mysqlc/mysqlc_general \ )) -$(eval $(call gb_Library_set_componentfile,mysqlc,connectivity/source/drivers/mysqlc/mysqlc)) +$(eval $(call gb_Library_set_componentfile,mysqlc,connectivity/source/drivers/mysqlc/mysqlc,services)) # vim: set noet sw=4 ts=4: diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index 9ab70270cfc7..b14412932083 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Library_Library,odbc)) -$(eval $(call gb_Library_set_componentfile,odbc,connectivity/source/drivers/odbc/odbc)) +$(eval $(call gb_Library_set_componentfile,odbc,connectivity/source/drivers/odbc/odbc,services)) $(eval $(call gb_Library_use_sdk_api,odbc)) diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index c372f3f0c6f6..8aa02ae169d5 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -66,7 +66,7 @@ $(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\ endif endif -$(eval $(call gb_Library_set_componentfile,postgresql-sdbc-impl,connectivity/source/drivers/postgresql/postgresql-sdbc-impl)) +$(eval $(call gb_Library_set_componentfile,postgresql-sdbc-impl,connectivity/source/drivers/postgresql/postgresql-sdbc-impl,postgresql-sdbc)) $(eval $(call gb_Library_add_exception_objects,postgresql-sdbc-impl,\ connectivity/source/drivers/postgresql/pq_array \ diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index 48613ab91bfc..b8b39faec9ca 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -25,7 +25,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\ salhelper \ )) -$(eval $(call gb_Library_set_componentfile,postgresql-sdbc,connectivity/source/drivers/postgresql/postgresql-sdbc)) +$(eval $(call gb_Library_set_componentfile,postgresql-sdbc,connectivity/source/drivers/postgresql/postgresql-sdbc,postgresql-sdbc)) $(eval $(call gb_Library_add_exception_objects,postgresql-sdbc,\ connectivity/source/drivers/postgresql/pq_driver \ diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk index 5685d1af1de1..e7296a2efc59 100644 --- a/connectivity/Library_sdbc2.mk +++ b/connectivity/Library_sdbc2.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Library_Library,sdbc2)) -$(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdbc2)) +$(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdbc2,services)) $(eval $(call gb_Library_use_external,sdbc2,boost_headers)) diff --git a/connectivity/Library_writer.mk b/connectivity/Library_writer.mk index 242d684c9de0..a653e5502d83 100644 --- a/connectivity/Library_writer.mk +++ b/connectivity/Library_writer.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Library_Library,writer)) -$(eval $(call gb_Library_set_componentfile,writer,connectivity/source/drivers/writer/writer)) +$(eval $(call gb_Library_set_componentfile,writer,connectivity/source/drivers/writer/writer,services)) $(eval $(call gb_Library_use_external,writer,boost_headers)) diff --git a/connectivity/Rdb_postgresql-sdbc.mk b/connectivity/Rdb_postgresql-sdbc.mk index 6162b309d6ba..e6c3b06e0695 100644 --- a/connectivity/Rdb_postgresql-sdbc.mk +++ b/connectivity/Rdb_postgresql-sdbc.mk @@ -9,9 +9,4 @@ $(eval $(call gb_Rdb_Rdb_install,postgresql-sdbc)) -$(eval $(call gb_Rdb_add_components,postgresql-sdbc,\ - connectivity/source/drivers/postgresql/postgresql-sdbc \ - connectivity/source/drivers/postgresql/postgresql-sdbc-impl \ -)) - # vim: set noet sw=4 ts=4: |