diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:29:24 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-09-28 16:49:08 +0200 |
commit | 5032dc0fc339ba6b200e80a5482cc86e00662a0b (patch) | |
tree | 6ecb751f6fd25a7ee5f66434b10928423d1e05f7 /connectivity | |
parent | 7312f5ceacd44c9980b9262e403d4d9ac10f1aa9 (diff) |
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
Diffstat (limited to 'connectivity')
26 files changed, 0 insertions, 52 deletions
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 \ |