gbuild: replace direct gb_STDLIBS use with ...

... new gb_LinkTarget_add_standard_system_libs

Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69

7 files changed, 14 insertions, 7 deletions

diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 99a19042cb21..1d9f6fb297ce 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -71,9 +71,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \
     vcl \
     xo \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_filters_test))
+
 $(eval $(call gb_CppunitTest_set_include,sd_filters_test,\
     -I$(SRCDIR)/sd/source/ui/inc \
     -I$(SRCDIR)/sd/inc \
diff --git a/sd/CppunitTest_sd_regression_test.mk b/sd/CppunitTest_sd_regression_test.mk
index e0a5000359de..85ea7eb91f1b 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -66,9 +66,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_regression_test, \
     vcl \
     xo \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_regression_test))
+
 $(eval $(call gb_CppunitTest_set_include,sd_regression_test,\
     -I$(SRCDIR)/sd/source/ui/inc \
     -I$(SRCDIR)/sd/inc \
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index 5209b6445001..70f742949bc4 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -72,9 +72,10 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\
     vcl \
     xo \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,sd_uimpress))
+
 ifeq ($(OS),WNT)
 $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\
 	ws2_32 \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index b0535d506bbd..3ac73b8f0857 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -104,9 +104,10 @@ $(eval $(call gb_Library_use_libraries,sd,\
     vcl \
     xmlsecurity \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,sd))
+
 $(eval $(call gb_Library_use_externals,sd,\
  libxml2 \
  dbus \
diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk
index 404ea819e63a..c668637a588c 100644
--- a/sd/Library_sdd.mk
+++ b/sd/Library_sdd.mk
@@ -48,9 +48,10 @@ $(eval $(call gb_Library_use_libraries,sdd,\
     utl \
     vcl \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,sdd))
+
 $(eval $(call gb_Library_set_componentfile,sdd,sd/util/sdd))
 
 $(eval $(call gb_Library_add_exception_objects,sdd,\
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index 2402116a33e2..b0b0d967731e 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -66,9 +66,10 @@ $(eval $(call gb_Library_use_libraries,sdfilt,\
     utl \
     vcl \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,sdfilt))
+
 $(eval $(call gb_Library_set_componentfile,sdfilt,sd/util/sdfilt))
 
 $(eval $(call gb_Library_add_exception_objects,sdfilt,\
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index 7fcf0b01bae2..7949f732e34e 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -65,9 +65,10 @@ $(eval $(call gb_Library_use_libraries,sdui,\
     utl \
     vcl \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,sdui))
+
 $(eval $(call gb_Library_add_exception_objects,sdui,\
     sd/source/filter/html/htmlattr \
     sd/source/filter/html/pubdlg \