From 6f6f7a17dc82248446dc4eddfd51af08362fc352 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 26 Sep 2012 23:45:28 +0200 Subject: gbuild: split uwinapi out of gb_STDLIBS Change-Id: I53316e0b9369d806197bccb42cf22d3497af43e7 --- connectivity/Library_ado.mk | 1 + connectivity/Library_calc.mk | 1 + connectivity/Library_dbase.mk | 1 + connectivity/Library_dbpool2.mk | 1 + connectivity/Library_dbtools.mk | 1 + connectivity/Library_evoab.mk | 1 + connectivity/Library_file.mk | 1 + connectivity/Library_flat.mk | 1 + connectivity/Library_hsqldb.mk | 1 + connectivity/Library_jdbc.mk | 1 + connectivity/Library_mork.mk | 1 + connectivity/Library_mozab.mk | 1 + connectivity/Library_mozabdrv.mk | 1 + connectivity/Library_mozbootstrap.mk | 1 + connectivity/Library_mysql.mk | 1 + connectivity/Library_odbc.mk | 1 + connectivity/Library_odbcbase.mk | 1 + connectivity/Library_postgresql-sdbc-impl.mk | 1 + connectivity/Library_postgresql-sdbc.mk | 1 + connectivity/Library_sdbc2.mk | 1 + 20 files changed, 20 insertions(+) (limited to 'connectivity') diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index d9d120f88594..4bd5d78cc247 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,ado,\ uuid \ dbtools \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index 93431fcf3b4b..ffd3f71640fe 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,calc,\ dbtools \ file \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index 5dd69321af53..68f4ea449d80 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_use_libraries,dbase,\ file \ utl \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk index 127a3e7cfad9..e128c937ee41 100644 --- a/connectivity/Library_dbpool2.mk +++ b/connectivity/Library_dbpool2.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\ dbtools \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index c82e568e780d..1cce1c6e246f 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,dbtools,\ tl \ comphelper \ i18nisolang1 \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 882cdb0da054..78cf2d73957e 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,evoab,\ salhelper \ dbtools \ file \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index 74186792ece6..8c21f99fed5e 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,file,\ dbtools \ utl \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index a69d0f221ae9..601f96f06b4f 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_libraries,flat,\ dbtools \ file \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index a3aef6d8906f..1ffd932298dd 100644 --- a/connectivity/Library_hsqldb.mk +++ b/connectivity/Library_hsqldb.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\ sal \ tl \ utl \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 70e553d0d3b8..704f050b6755 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,jdbc,\ utl \ jvmfwk \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index 9a73cd09b447..c2b95a0416db 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -27,6 +27,7 @@ $(eval $(call gb_Library_use_libraries,mork, \ dbtools \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk index afde265bf630..7872b26932db 100644 --- a/connectivity/Library_mozab.mk +++ b/connectivity/Library_mozab.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,mozab2,\ cppuhelper \ dbtools \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk index b1c29ee0f811..0e4c541ea6c4 100644 --- a/connectivity/Library_mozabdrv.mk +++ b/connectivity/Library_mozabdrv.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\ dbtools \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk index aab40dcc030b..649f9907c06a 100644 --- a/connectivity/Library_mozbootstrap.mk +++ b/connectivity/Library_mozbootstrap.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Library_use_libraries,mozbootstrap,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk index 5e17042fd5e0..388af52f2263 100644 --- a/connectivity/Library_mysql.mk +++ b/connectivity/Library_mysql.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_use_libraries,mysql,\ sal \ dbtools \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index d6c3dc547cf6..4b0e61baa48b 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_use_libraries,odbc,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index 4d25b1c9fdd4..9655773afa00 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,odbcbase,\ salhelper \ dbtools \ comphelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index b77f16c80702..439524882f8d 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ cppuhelper \ sal \ salhelper \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index 202614dd52ff..7646af16ef12 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\ cppu \ cppuhelper \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk index eb8789caacd6..032937a81e6e 100644 --- a/connectivity/Library_sdbc2.mk +++ b/connectivity/Library_sdbc2.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\ dbtools \ utl \ sal \ + $(gb_UWINAPI) \ $(gb_STDLIBS) \ )) -- cgit From 816ec4b0933e36ac468230365359c3b9d8d52986 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 27 Sep 2012 00:49:12 +0200 Subject: gbuild: replace direct gb_STDLIBS use with ... ... new gb_LinkTarget_add_standard_system_libs Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69 --- connectivity/Library_ado.mk | 3 ++- connectivity/Library_calc.mk | 3 ++- connectivity/Library_dbase.mk | 3 ++- connectivity/Library_dbpool2.mk | 3 ++- connectivity/Library_dbtools.mk | 3 ++- connectivity/Library_evoab.mk | 3 ++- connectivity/Library_file.mk | 3 ++- connectivity/Library_flat.mk | 3 ++- connectivity/Library_hsqldb.mk | 3 ++- connectivity/Library_jdbc.mk | 3 ++- connectivity/Library_kab1.mk | 3 ++- connectivity/Library_kabdrv1.mk | 3 ++- connectivity/Library_macab1.mk | 3 ++- connectivity/Library_macabdrv1.mk | 3 ++- connectivity/Library_mork.mk | 3 ++- connectivity/Library_mozab.mk | 3 ++- connectivity/Library_mozabdrv.mk | 3 ++- connectivity/Library_mozbootstrap.mk | 3 ++- connectivity/Library_mysql.mk | 3 ++- connectivity/Library_odbc.mk | 3 ++- connectivity/Library_odbcbase.mk | 3 ++- connectivity/Library_postgresql-sdbc-impl.mk | 3 ++- connectivity/Library_postgresql-sdbc.mk | 3 ++- connectivity/Library_sdbc2.mk | 3 ++- connectivity/Library_tdeab1.mk | 3 ++- connectivity/Library_tdeabdrv1.mk | 3 ++- 26 files changed, 52 insertions(+), 26 deletions(-) (limited to 'connectivity') diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index 4bd5d78cc247..bd24464a5331 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,ado,\ dbtools \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,ado)) + $(eval $(call gb_Library_add_exception_objects,ado,\ connectivity/source/drivers/ado/ADatabaseMetaDataImpl \ connectivity/source/drivers/ado/Aolevariant \ diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index ffd3f71640fe..489542bbe743 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,calc,\ file \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,calc)) + $(eval $(call gb_Library_add_exception_objects,calc,\ connectivity/source/drivers/calc/CResultSet \ connectivity/source/drivers/calc/CStatement \ diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index 68f4ea449d80..14c61ec5fcd8 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,dbase,\ utl \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbase)) + $(eval $(call gb_Library_add_exception_objects,dbase,\ connectivity/source/drivers/dbase/DCode \ connectivity/source/drivers/dbase/DResultSet \ diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk index e128c937ee41..ac008feb4bac 100644 --- a/connectivity/Library_dbpool2.mk +++ b/connectivity/Library_dbpool2.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbpool2)) + $(eval $(call gb_Library_add_exception_objects,dbpool2,\ connectivity/source/cpool/ZConnectionWrapper \ connectivity/source/cpool/ZDriverWrapper \ diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 1cce1c6e246f..74d8fea6058e 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,dbtools,\ comphelper \ i18nisolang1 \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,dbtools)) + ifeq ($(filter-out NETBSD MACOSX,$(OS)),) $(eval $(call gb_Library_use_libraries,dbtools,\ ucbhelper \ diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 78cf2d73957e..4606b8865e1d 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -54,9 +54,10 @@ $(eval $(call gb_Library_use_libraries,evoab,\ dbtools \ file \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,evoab)) + $(eval $(call gb_Library_add_exception_objects,evoab,\ connectivity/source/drivers/evoab2/NDriver \ connectivity/source/drivers/evoab2/NTable \ diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index 8c21f99fed5e..c3326b4af484 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,file,\ utl \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,file)) + $(eval $(call gb_Library_add_exception_objects,file,\ connectivity/source/drivers/file/FCatalog \ connectivity/source/drivers/file/FColumns \ diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index 601f96f06b4f..84345d803895 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,flat,\ file \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,flat)) + $(eval $(call gb_Library_add_exception_objects,flat,\ connectivity/source/drivers/flat/EResultSet \ connectivity/source/drivers/flat/EStatement \ diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index 1ffd932298dd..b8b0e0f4372d 100644 --- a/connectivity/Library_hsqldb.mk +++ b/connectivity/Library_hsqldb.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\ tl \ utl \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,hsqldb)) + $(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb)) $(eval $(call gb_Library_add_exception_objects,hsqldb,\ diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 704f050b6755..71edd85d90d5 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,jdbc,\ jvmfwk \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,jdbc)) + $(eval $(call gb_Library_add_exception_objects,jdbc,\ connectivity/source/drivers/jdbc/Array \ connectivity/source/drivers/jdbc/Blob \ diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk index 86f713d15ef9..8f2c04ee1263 100644 --- a/connectivity/Library_kab1.mk +++ b/connectivity/Library_kab1.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,kab1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,kab1)) + $(eval $(call gb_Library_add_exception_objects,kab1,\ connectivity/source/drivers/kab/KDriver \ connectivity/source/drivers/kab/KServices \ diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk index 6a0f16c427f0..097848e6e567 100644 --- a/connectivity/Library_kabdrv1.mk +++ b/connectivity/Library_kabdrv1.mk @@ -53,9 +53,10 @@ $(eval $(call gb_Library_use_libraries,kabdrv1,\ salhelper \ dbtools \ comphelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,kabdrv1)) + $(eval $(call gb_Library_add_exception_objects,kabdrv1,\ connectivity/source/drivers/kab/KColumns \ connectivity/source/drivers/kab/KTable \ diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk index 842394c40bfa..7058eb553ae6 100644 --- a/connectivity/Library_macab1.mk +++ b/connectivity/Library_macab1.mk @@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,macab1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,macab1)) + $(eval $(call gb_Library_set_include,macab1,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk index 471c6c777ff3..bfb78473a161 100644 --- a/connectivity/Library_macabdrv1.mk +++ b/connectivity/Library_macabdrv1.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,macabdrv1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,macabdrv1)) + $(eval $(call gb_Library_set_include,macabdrv1,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index c2b95a0416db..009a3c79b01f 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -28,9 +28,10 @@ $(eval $(call gb_Library_use_libraries,mork, \ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mork)) + $(eval $(call gb_Library_use_sdk_api,mork)) $(eval $(call gb_Library_add_exception_objects,mork, \ diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk index 7872b26932db..394d227ea51f 100644 --- a/connectivity/Library_mozab.mk +++ b/connectivity/Library_mozab.mk @@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,mozab2,\ dbtools \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mozab2)) + $(eval $(call gb_Library_add_exception_objects,mozab2,\ connectivity/source/drivers/mozab/MDriver \ connectivity/source/drivers/mozab/MServices \ diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk index 0e4c541ea6c4..b7f95a811fa0 100644 --- a/connectivity/Library_mozabdrv.mk +++ b/connectivity/Library_mozabdrv.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mozabdrv)) + $(eval $(call gb_Library_use_externals,mozabdrv,\ mozilla \ )) diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk index 649f9907c06a..edfb4986d943 100644 --- a/connectivity/Library_mozbootstrap.mk +++ b/connectivity/Library_mozbootstrap.mk @@ -46,9 +46,10 @@ $(eval $(call gb_Library_use_libraries,mozbootstrap,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mozbootstrap)) + $(eval $(call gb_Library_add_exception_objects,mozbootstrap,\ connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap \ connectivity/source/drivers/mozab/bootstrap/MNSFolders \ diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk index 388af52f2263..71bdd14bec67 100644 --- a/connectivity/Library_mysql.mk +++ b/connectivity/Library_mysql.mk @@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,mysql,\ dbtools \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,mysql)) + $(eval $(call gb_Library_add_exception_objects,mysql,\ connectivity/source/drivers/mysql/YDriver \ connectivity/source/drivers/mysql/YTables \ diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index 4b0e61baa48b..32961f472a61 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,odbc,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,odbc)) + $(eval $(call gb_Library_add_exception_objects,odbc,\ connectivity/source/drivers/odbc/oservices \ connectivity/source/drivers/odbc/ORealDriver \ diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index 9655773afa00..f2b2d41d5b12 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -51,9 +51,10 @@ $(eval $(call gb_Library_use_libraries,odbcbase,\ dbtools \ comphelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,odbcbase)) + $(eval $(call gb_Library_add_exception_objects,odbcbase,\ connectivity/source/drivers/odbcbase/OPreparedStatement \ connectivity/source/drivers/odbcbase/OStatement \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 439524882f8d..50900b1b7f66 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ sal \ salhelper \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc-impl)) + ifeq ($(OS),WNT) $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ shell32 \ diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index 7646af16ef12..60fbfc97f9f7 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -40,9 +40,10 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\ cppuhelper \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc)) + $(eval $(call gb_Library_set_componentfile,postgresql-sdbc,connectivity/source/drivers/postgresql/postgresql-sdbc)) $(eval $(call gb_Library_add_exception_objects,postgresql-sdbc,\ diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk index 032937a81e6e..60db324099f8 100644 --- a/connectivity/Library_sdbc2.mk +++ b/connectivity/Library_sdbc2.mk @@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\ utl \ sal \ $(gb_UWINAPI) \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,sdbc2)) + $(eval $(call gb_Library_add_exception_objects,sdbc2,\ connectivity/source/manager/mdrivermanager \ connectivity/source/manager/mregistration \ diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk index 9cc62e2433f1..8c402457d7fc 100644 --- a/connectivity/Library_tdeab1.mk +++ b/connectivity/Library_tdeab1.mk @@ -47,9 +47,10 @@ $(eval $(call gb_Library_use_libraries,tdeab1,\ dbtools \ sal \ salhelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tdeab1)) + $(eval $(call gb_Library_add_exception_objects,tdeab1,\ connectivity/source/drivers/kab/KDriver \ connectivity/source/drivers/kab/KServices \ diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk index b2ceb087b798..40601d7cf416 100644 --- a/connectivity/Library_tdeabdrv1.mk +++ b/connectivity/Library_tdeabdrv1.mk @@ -49,9 +49,10 @@ $(eval $(call gb_Library_use_libraries,tdeabdrv1,\ salhelper \ dbtools \ comphelper \ - $(gb_STDLIBS) \ )) +$(eval $(call gb_Library_add_standard_system_libs,tdeabdrv1)) + $(eval $(call gb_Library_add_exception_objects,tdeabdrv1,\ connectivity/source/drivers/kab/KColumns \ connectivity/source/drivers/kab/KTable \ -- cgit From ecddbecedccf2bf67e569544854c6fbd1269dd88 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 00:18:12 +0200 Subject: gbuild: clean up Mac OS X framework handling: There are currently 3 different mechanisms being used for frameworks, which is of course intolerable so we invent a 4th one and standardize on it: gb_LinkTarget_use_darwin_frameworks (This doesn't mean using add_libs or externals was wrong, it was just inconsistent... and i don't see an obvious benefit of using externals here) Change-Id: I5de9020402c87e7236c6a358c47f02fa56642d3d --- connectivity/Library_macabdrv1.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'connectivity') diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk index bfb78473a161..feb754356a51 100644 --- a/connectivity/Library_macabdrv1.mk +++ b/connectivity/Library_macabdrv1.mk @@ -29,9 +29,9 @@ $(eval $(call gb_Library_Library,macabdrv1)) $(eval $(call gb_Library_use_sdk_api,macabdrv1)) -$(eval $(call gb_Library_add_libs,macabdrv1,\ - -framework Carbon \ - -framework AddressBook \ +$(eval $(call gb_Library_use_system_darwin_frameworks,macabdrv1,\ + Carbon \ + AddressBook \ )) $(eval $(call gb_Library_use_libraries,macabdrv1,\ -- cgit From 8831c592e80288be39a9e5f4d20e617b55682003 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 15:31:46 +0200 Subject: gbuild: gb_Library_PLAINLIBS_NONE cleanup for WNT: add a new gb_LinkTarget_use_system_win32_libs to abstract different linker options on MSVC and GCC. Change-Id: Ic9bf2545f59bf7871e6fc06b290c486ddfbec03d --- connectivity/Library_ado.mk | 9 ++++++--- connectivity/Library_postgresql-sdbc-impl.mk | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'connectivity') diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index bd24464a5331..ed088bc89ee5 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -42,14 +42,17 @@ $(eval $(call gb_Library_add_cxxflags,ado,\ )) endif +$(eval $(call gb_Library_use_system_win32_libs,ado,\ + ole32 \ + oleaut32 \ + uuid \ +)) + $(eval $(call gb_Library_use_libraries,ado,\ cppu \ cppuhelper \ sal \ salhelper \ - ole32 \ - oleaut32 \ - uuid \ dbtools \ comphelper \ $(gb_UWINAPI) \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 50900b1b7f66..a76eb7b735b6 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ $(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc-impl)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ +$(eval $(call gb_Library_use_system_win32_libs,postgresql-sdbc-impl,\ shell32 \ wldap32 \ )) -- cgit From f011af716e2978cbf9fcb7748dc868c503edddff Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 16:29:24 +0200 Subject: gbuild: invert handling of standard system libraries: Always link in gb_STDLIBS, except when the library explicitly opts out with gb_LinkTarget_disable_standard_system_libs. Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a --- connectivity/Library_ado.mk | 2 -- connectivity/Library_calc.mk | 2 -- connectivity/Library_dbase.mk | 2 -- connectivity/Library_dbpool2.mk | 2 -- connectivity/Library_dbtools.mk | 2 -- connectivity/Library_evoab.mk | 2 -- connectivity/Library_file.mk | 2 -- connectivity/Library_flat.mk | 2 -- connectivity/Library_hsqldb.mk | 2 -- connectivity/Library_jdbc.mk | 2 -- connectivity/Library_kab1.mk | 2 -- connectivity/Library_kabdrv1.mk | 2 -- connectivity/Library_macab1.mk | 2 -- connectivity/Library_macabdrv1.mk | 2 -- connectivity/Library_mork.mk | 2 -- connectivity/Library_mozab.mk | 2 -- connectivity/Library_mozabdrv.mk | 2 -- connectivity/Library_mozbootstrap.mk | 2 -- connectivity/Library_mysql.mk | 2 -- connectivity/Library_odbc.mk | 2 -- connectivity/Library_odbcbase.mk | 2 -- connectivity/Library_postgresql-sdbc-impl.mk | 2 -- connectivity/Library_postgresql-sdbc.mk | 2 -- connectivity/Library_sdbc2.mk | 2 -- connectivity/Library_tdeab1.mk | 2 -- connectivity/Library_tdeabdrv1.mk | 2 -- 26 files changed, 52 deletions(-) (limited to 'connectivity') diff --git a/connectivity/Library_ado.mk b/connectivity/Library_ado.mk index ed088bc89ee5..68abe62a2a1f 100644 --- a/connectivity/Library_ado.mk +++ b/connectivity/Library_ado.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,ado,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,ado)) - $(eval $(call gb_Library_add_exception_objects,ado,\ connectivity/source/drivers/ado/ADatabaseMetaDataImpl \ connectivity/source/drivers/ado/Aolevariant \ diff --git a/connectivity/Library_calc.mk b/connectivity/Library_calc.mk index 489542bbe743..aedd21bb3347 100644 --- a/connectivity/Library_calc.mk +++ b/connectivity/Library_calc.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,calc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,calc)) - $(eval $(call gb_Library_add_exception_objects,calc,\ connectivity/source/drivers/calc/CResultSet \ connectivity/source/drivers/calc/CStatement \ diff --git a/connectivity/Library_dbase.mk b/connectivity/Library_dbase.mk index 14c61ec5fcd8..0dbb517bd6ae 100644 --- a/connectivity/Library_dbase.mk +++ b/connectivity/Library_dbase.mk @@ -52,8 +52,6 @@ $(eval $(call gb_Library_use_libraries,dbase,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbase)) - $(eval $(call gb_Library_add_exception_objects,dbase,\ connectivity/source/drivers/dbase/DCode \ connectivity/source/drivers/dbase/DResultSet \ diff --git a/connectivity/Library_dbpool2.mk b/connectivity/Library_dbpool2.mk index ac008feb4bac..fbccc3ae0737 100644 --- a/connectivity/Library_dbpool2.mk +++ b/connectivity/Library_dbpool2.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,dbpool2,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbpool2)) - $(eval $(call gb_Library_add_exception_objects,dbpool2,\ connectivity/source/cpool/ZConnectionWrapper \ connectivity/source/cpool/ZDriverWrapper \ diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index 74d8fea6058e..964f9f372950 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -58,8 +58,6 @@ $(eval $(call gb_Library_use_libraries,dbtools,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,dbtools)) - ifeq ($(filter-out NETBSD MACOSX,$(OS)),) $(eval $(call gb_Library_use_libraries,dbtools,\ ucbhelper \ diff --git a/connectivity/Library_evoab.mk b/connectivity/Library_evoab.mk index 4606b8865e1d..687245571f13 100644 --- a/connectivity/Library_evoab.mk +++ b/connectivity/Library_evoab.mk @@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,evoab,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,evoab)) - $(eval $(call gb_Library_add_exception_objects,evoab,\ connectivity/source/drivers/evoab2/NDriver \ connectivity/source/drivers/evoab2/NTable \ diff --git a/connectivity/Library_file.mk b/connectivity/Library_file.mk index c3326b4af484..8ee3d104022d 100644 --- a/connectivity/Library_file.mk +++ b/connectivity/Library_file.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,file,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,file)) - $(eval $(call gb_Library_add_exception_objects,file,\ connectivity/source/drivers/file/FCatalog \ connectivity/source/drivers/file/FColumns \ diff --git a/connectivity/Library_flat.mk b/connectivity/Library_flat.mk index 84345d803895..32e46440dc66 100644 --- a/connectivity/Library_flat.mk +++ b/connectivity/Library_flat.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,flat,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,flat)) - $(eval $(call gb_Library_add_exception_objects,flat,\ connectivity/source/drivers/flat/EResultSet \ connectivity/source/drivers/flat/EStatement \ diff --git a/connectivity/Library_hsqldb.mk b/connectivity/Library_hsqldb.mk index b8b0e0f4372d..8521ae3107d9 100644 --- a/connectivity/Library_hsqldb.mk +++ b/connectivity/Library_hsqldb.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,hsqldb,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,hsqldb)) - $(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb)) $(eval $(call gb_Library_add_exception_objects,hsqldb,\ diff --git a/connectivity/Library_jdbc.mk b/connectivity/Library_jdbc.mk index 71edd85d90d5..23b755374e55 100644 --- a/connectivity/Library_jdbc.mk +++ b/connectivity/Library_jdbc.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,jdbc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,jdbc)) - $(eval $(call gb_Library_add_exception_objects,jdbc,\ connectivity/source/drivers/jdbc/Array \ connectivity/source/drivers/jdbc/Blob \ diff --git a/connectivity/Library_kab1.mk b/connectivity/Library_kab1.mk index 8f2c04ee1263..7fd80cb65b65 100644 --- a/connectivity/Library_kab1.mk +++ b/connectivity/Library_kab1.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,kab1,\ salhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,kab1)) - $(eval $(call gb_Library_add_exception_objects,kab1,\ connectivity/source/drivers/kab/KDriver \ connectivity/source/drivers/kab/KServices \ diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk index 097848e6e567..ecdd90568d98 100644 --- a/connectivity/Library_kabdrv1.mk +++ b/connectivity/Library_kabdrv1.mk @@ -55,8 +55,6 @@ $(eval $(call gb_Library_use_libraries,kabdrv1,\ comphelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,kabdrv1)) - $(eval $(call gb_Library_add_exception_objects,kabdrv1,\ connectivity/source/drivers/kab/KColumns \ connectivity/source/drivers/kab/KTable \ diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk index 7058eb553ae6..e55422cf924f 100644 --- a/connectivity/Library_macab1.mk +++ b/connectivity/Library_macab1.mk @@ -39,8 +39,6 @@ $(eval $(call gb_Library_use_libraries,macab1,\ salhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,macab1)) - $(eval $(call gb_Library_set_include,macab1,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk index feb754356a51..c4e77daaa417 100644 --- a/connectivity/Library_macabdrv1.mk +++ b/connectivity/Library_macabdrv1.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,macabdrv1,\ salhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,macabdrv1)) - $(eval $(call gb_Library_set_include,macabdrv1,\ $$(INCLUDE) \ -I$(SRCDIR)/connectivity/inc \ diff --git a/connectivity/Library_mork.mk b/connectivity/Library_mork.mk index 009a3c79b01f..b11cb4f586af 100644 --- a/connectivity/Library_mork.mk +++ b/connectivity/Library_mork.mk @@ -30,8 +30,6 @@ $(eval $(call gb_Library_use_libraries,mork, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mork)) - $(eval $(call gb_Library_use_sdk_api,mork)) $(eval $(call gb_Library_add_exception_objects,mork, \ diff --git a/connectivity/Library_mozab.mk b/connectivity/Library_mozab.mk index 394d227ea51f..4b4b78927229 100644 --- a/connectivity/Library_mozab.mk +++ b/connectivity/Library_mozab.mk @@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,mozab2,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mozab2)) - $(eval $(call gb_Library_add_exception_objects,mozab2,\ connectivity/source/drivers/mozab/MDriver \ connectivity/source/drivers/mozab/MServices \ diff --git a/connectivity/Library_mozabdrv.mk b/connectivity/Library_mozabdrv.mk index b7f95a811fa0..b73efc2ec13d 100644 --- a/connectivity/Library_mozabdrv.mk +++ b/connectivity/Library_mozabdrv.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,mozabdrv,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mozabdrv)) - $(eval $(call gb_Library_use_externals,mozabdrv,\ mozilla \ )) diff --git a/connectivity/Library_mozbootstrap.mk b/connectivity/Library_mozbootstrap.mk index edfb4986d943..cdea5e935bd7 100644 --- a/connectivity/Library_mozbootstrap.mk +++ b/connectivity/Library_mozbootstrap.mk @@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,mozbootstrap,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mozbootstrap)) - $(eval $(call gb_Library_add_exception_objects,mozbootstrap,\ connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap \ connectivity/source/drivers/mozab/bootstrap/MNSFolders \ diff --git a/connectivity/Library_mysql.mk b/connectivity/Library_mysql.mk index 71bdd14bec67..4e05e402e1e1 100644 --- a/connectivity/Library_mysql.mk +++ b/connectivity/Library_mysql.mk @@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,mysql,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,mysql)) - $(eval $(call gb_Library_add_exception_objects,mysql,\ connectivity/source/drivers/mysql/YDriver \ connectivity/source/drivers/mysql/YTables \ diff --git a/connectivity/Library_odbc.mk b/connectivity/Library_odbc.mk index 32961f472a61..3f7ccbf02301 100644 --- a/connectivity/Library_odbc.mk +++ b/connectivity/Library_odbc.mk @@ -50,8 +50,6 @@ $(eval $(call gb_Library_use_libraries,odbc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,odbc)) - $(eval $(call gb_Library_add_exception_objects,odbc,\ connectivity/source/drivers/odbc/oservices \ connectivity/source/drivers/odbc/ORealDriver \ diff --git a/connectivity/Library_odbcbase.mk b/connectivity/Library_odbcbase.mk index f2b2d41d5b12..8335f7e0b1b5 100644 --- a/connectivity/Library_odbcbase.mk +++ b/connectivity/Library_odbcbase.mk @@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,odbcbase,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,odbcbase)) - $(eval $(call gb_Library_add_exception_objects,odbcbase,\ connectivity/source/drivers/odbcbase/OPreparedStatement \ connectivity/source/drivers/odbcbase/OStatement \ diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index a76eb7b735b6..7e525a9af7f0 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc-impl)) - ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,postgresql-sdbc-impl,\ shell32 \ diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index 60fbfc97f9f7..1a9f8eb1dd6c 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -42,8 +42,6 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,postgresql-sdbc)) - $(eval $(call gb_Library_set_componentfile,postgresql-sdbc,connectivity/source/drivers/postgresql/postgresql-sdbc)) $(eval $(call gb_Library_add_exception_objects,postgresql-sdbc,\ diff --git a/connectivity/Library_sdbc2.mk b/connectivity/Library_sdbc2.mk index 60db324099f8..7f030f1d53cd 100644 --- a/connectivity/Library_sdbc2.mk +++ b/connectivity/Library_sdbc2.mk @@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,sdbc2,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sdbc2)) - $(eval $(call gb_Library_add_exception_objects,sdbc2,\ connectivity/source/manager/mdrivermanager \ connectivity/source/manager/mregistration \ diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk index 8c402457d7fc..59f2f80cf039 100644 --- a/connectivity/Library_tdeab1.mk +++ b/connectivity/Library_tdeab1.mk @@ -49,8 +49,6 @@ $(eval $(call gb_Library_use_libraries,tdeab1,\ salhelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,tdeab1)) - $(eval $(call gb_Library_add_exception_objects,tdeab1,\ connectivity/source/drivers/kab/KDriver \ connectivity/source/drivers/kab/KServices \ diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk index 40601d7cf416..b2df458fd4a0 100644 --- a/connectivity/Library_tdeabdrv1.mk +++ b/connectivity/Library_tdeabdrv1.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,tdeabdrv1,\ comphelper \ )) -$(eval $(call gb_Library_add_standard_system_libs,tdeabdrv1)) - $(eval $(call gb_Library_add_exception_objects,tdeabdrv1,\ connectivity/source/drivers/kab/KColumns \ connectivity/source/drivers/kab/KTable \ -- cgit From f5f06fb016766cc40817f1fcc3feec0b464845b0 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Sat, 29 Sep 2012 17:20:22 +0200 Subject: Use comphelper::getComponentContext ...and some further clean up. Change-Id: Id294c0f38fe0041646fc86cacbd2e19734c746a9 --- connectivity/Library_postgresql-sdbc.mk | 1 + .../source/drivers/postgresql/pq_driver.cxx | 23 ++++++---------------- connectivity/source/resource/sharedresources.cxx | 9 +-------- 3 files changed, 8 insertions(+), 25 deletions(-) (limited to 'connectivity') diff --git a/connectivity/Library_postgresql-sdbc.mk b/connectivity/Library_postgresql-sdbc.mk index 1a9f8eb1dd6c..4ce53d8eada0 100644 --- a/connectivity/Library_postgresql-sdbc.mk +++ b/connectivity/Library_postgresql-sdbc.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_add_defs,postgresql-sdbc,\ $(eval $(call gb_Library_use_sdk_api,postgresql-sdbc)) $(eval $(call gb_Library_use_libraries,postgresql-sdbc,\ + comphelper \ cppu \ cppuhelper \ sal \ diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx b/connectivity/source/drivers/postgresql/pq_driver.cxx index ed8480c318c4..5a8dd9c15bf3 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.cxx +++ b/connectivity/source/drivers/postgresql/pq_driver.cxx @@ -57,13 +57,12 @@ #include +#include #include #include #include #include -#include - #include "pq_driver.hxx" using rtl::OUString; @@ -86,7 +85,6 @@ using com::sun::star::uno::XComponentContext; using com::sun::star::uno::Any; using com::sun::star::beans::PropertyValue; -using com::sun::star::beans::XPropertySet; using com::sun::star::sdbc::XConnection; using com::sun::star::sdbc::SQLException; @@ -352,26 +350,17 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( // XSingleComponentFactory interface ... void * pRet = 0; Reference< XSingleComponentFactory > xFactory; - Reference< XInterface > xSmgr( (XInterface * ) pServiceManager ); + Reference< com::sun::star::lang::XMultiServiceFactory > xSmgr( + static_cast< XInterface * >(pServiceManager), + com::sun::star::uno::UNO_QUERY_THROW ); for( sal_Int32 i = 0 ; g_entries[i].create ; i ++ ) { OUString implName = g_entries[i].getImplementationName(); if( 0 == implName.compareToAscii( pImplName ) ) { - Reference< XComponentContext > defaultContext; - Reference< XPropertySet > propSet( xSmgr, UNO_QUERY ); - if( propSet.is() ) - { - try - { - propSet->getPropertyValue( ASCII_STR( "DefaultContext" ) ) >>= defaultContext; - } - catch( com::sun::star::uno::Exception & ) - { - // if there is no default context, ignore it - } - } + Reference< XComponentContext > defaultContext( + comphelper::getComponentContext( xSmgr ) ); xFactory = new pq_sdbc_driver::OOneInstanceComponentFactory( implName, g_entries[i].create, diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx index 246591063547..902807829cb5 100644 --- a/connectivity/source/resource/sharedresources.cxx +++ b/connectivity/source/resource/sharedresources.cxx @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -35,8 +34,6 @@ namespace connectivity /** === begin UNO using === **/ using ::com::sun::star::uno::Reference; - using ::com::sun::star::beans::XPropertySet; - using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::XComponentContext; using ::com::sun::star::uno::Exception; /** === end UNO using === **/ @@ -82,12 +79,8 @@ namespace connectivity { try { - Reference< XPropertySet > xFactoryProps( - ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW ); Reference< XComponentContext > xContext( - xFactoryProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ), - UNO_QUERY_THROW - ); + comphelper::getProcessComponentContext() ); m_pResourceBundle.reset( new ::comphelper::OfficeResourceBundle( xContext, "cnr" ) ); } catch( const Exception& ) -- cgit From 39bac3f6c0a29d4d6ef7d6a636b8204cf12b4866 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 1 Oct 2012 15:19:10 +0200 Subject: translations is a source-only module Change-Id: I9fcddfcdfa2d60860a7b016dbb870a3b6e8f3ea4 --- connectivity/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'connectivity') diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst index 859142e6092c..8dc24e57c014 100644 --- a/connectivity/prj/build.lst +++ b/connectivity/prj/build.lst @@ -1,2 +1,2 @@ -cn connectivity : shell TRANSLATIONS:translations comphelper MOZ:moz POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL +cn connectivity : shell comphelper MOZ:moz POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL -- cgit