gbuild: replace direct gb_STDLIBS use with ...

... new gb_LinkTarget_add_standard_system_libs

Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69

9 files changed, 18 insertions, 9 deletions

diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index ad617f690582..766552e29396 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -40,9 +40,10 @@ $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \
 	test \
 	unotest \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,extensions_test_update))
+
 ifeq ($(OS),WNT)
 $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update,\
 	shell32 \
diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
index 708d89f5a7b6..82ac86bef87d 100644
--- a/extensions/Library_abp.mk
+++ b/extensions/Library_abp.mk
@@ -84,7 +84,8 @@ $(eval $(call gb_Library_use_libraries,abp,\
 	utl \
 	vcl \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,abp))
+
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
index aa4e368942a4..6ba529538ad3 100644
--- a/extensions/Library_bib.mk
+++ b/extensions/Library_bib.mk
@@ -68,7 +68,8 @@ $(eval $(call gb_Library_use_libraries,bib,\
 	cppu \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,bib))
+
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk
index 1f9c76917c72..caf72dc5114a 100644
--- a/extensions/Library_dbp.mk
+++ b/extensions/Library_dbp.mk
@@ -70,7 +70,8 @@ $(eval $(call gb_Library_use_libraries,dbp,\
 	cppu \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,dbp))
+
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
index 9fd561c884db..a366362cfea3 100644
--- a/extensions/Library_log.mk
+++ b/extensions/Library_log.mk
@@ -53,7 +53,8 @@ $(eval $(call gb_Library_use_libraries,log,\
 	cppu \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,log))
+
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk
index 847ba21c5604..974701566838 100644
--- a/extensions/Library_pcr.mk
+++ b/extensions/Library_pcr.mk
@@ -56,9 +56,10 @@ $(eval $(call gb_Library_use_libraries,pcr,\
 	sal \
 	salhelper \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,pcr))
+
 $(eval $(call gb_Library_add_exception_objects,pcr,\
 	extensions/source/propctrlr/MasterDetailLinkDialog \
 	extensions/source/propctrlr/browserline \
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index e6c5f0d7e1cf..45b1b75d58b7 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -131,9 +131,10 @@ $(eval $(call gb_Library_use_libraries,pl,\
 	sal \
 	salhelper \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,pl))
+
 $(eval $(call gb_Library_add_exception_objects,pl,\
 	extensions/source/plugin/base/context \
 	extensions/source/plugin/base/evtlstnr \
diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk
index cd7bc522b424..22587cc65e9c 100644
--- a/extensions/Library_res.mk
+++ b/extensions/Library_res.mk
@@ -42,9 +42,10 @@ $(eval $(call gb_Library_use_libraries,res,\
 	cppuhelper \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,res))
+
 $(eval $(call gb_Library_add_exception_objects,res,\
 	extensions/source/resource/ResourceIndexAccess \
 	extensions/source/resource/oooresourceloader \
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
index 7cca92e09eed..75872b73465f 100644
--- a/extensions/Library_scn.mk
+++ b/extensions/Library_scn.mk
@@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,scn,\
 	cppu \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,scn))
+
 $(eval $(call gb_Library_add_exception_objects,scn,\
 	extensions/source/scanner/scnserv \
 	extensions/source/scanner/scanner \