From b85c34978356eb01311f197f00f4dd5f808e3664 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
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