gbuild: replace direct gb_STDLIBS use with ...

... new gb_LinkTarget_add_standard_system_libs

Change-Id: Ib2bc843098db3d8c6822b45a3d21724e67f57d69

13 files changed, 26 insertions, 13 deletions

diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk
index 9ed4dd0f01e8..b32ba7e89b97 100644
--- a/shell/Executable_lngconvex.mk
+++ b/shell/Executable_lngconvex.mk
@@ -39,9 +39,10 @@ $(eval $(call gb_Executable_use_libraries,lngconvex,\
 	sal \
 	tl \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Executable_add_standard_system_libs,lngconvex))
+
 $(eval $(call gb_Executable_add_exception_objects,lngconvex,\
     shell/source/tools/lngconvex/cmdline \
     shell/source/tools/lngconvex/lngconvex \
diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk
index 0ae262bee72c..58c13032f883 100644
--- a/shell/Library_cmdmail.mk
+++ b/shell/Library_cmdmail.mk
@@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,cmdmail,\
 	cppuhelper \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,cmdmail))
+
 $(eval $(call gb_Library_set_componentfile,cmdmail,shell/source/cmdmail/cmdmail))
 
 $(eval $(call gb_Library_add_exception_objects,cmdmail,\
diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk
index fbc05a0e318c..28a0e8760ab0 100644
--- a/shell/Library_desktopbe.mk
+++ b/shell/Library_desktopbe.mk
@@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,desktopbe1,\
 	cppuhelper \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,desktopbe1))
+
 $(eval $(call gb_Library_set_componentfile,desktopbe1,shell/source/backends/desktopbe/desktopbe1))
 
 $(eval $(call gb_Library_add_exception_objects,desktopbe1,\
diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk
index 5e513237caba..d2deb022d20d 100644
--- a/shell/Library_gconfbe.mk
+++ b/shell/Library_gconfbe.mk
@@ -43,9 +43,10 @@ $(eval $(call gb_Library_use_libraries,gconfbe1,\
 	cppu \
 	cppuhelper \
 	sal \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,gconfbe1))
+
 $(eval $(call gb_Library_set_componentfile,gconfbe1,shell/source/backends/gconfbe/gconfbe1))
 
 $(eval $(call gb_Library_add_exception_objects,gconfbe1,\
diff --git a/shell/Library_kde4be.mk b/shell/Library_kde4be.mk
index c31fb68afea8..c20863655d9f 100644
--- a/shell/Library_kde4be.mk
+++ b/shell/Library_kde4be.mk
@@ -37,9 +37,10 @@ $(eval $(call gb_Library_use_libraries,kde4be1,\
 	cppu \
 	cppuhelper \
 	sal \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,kde4be1))
+
 $(eval $(call gb_Library_set_componentfile,kde4be1,shell/source/backends/kde4be/kde4be1))
 
 $(eval $(call gb_Library_add_exception_objects,kde4be1,\
diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk
index a367c8d62bf8..8637341d6ff0 100644
--- a/shell/Library_kdebe.mk
+++ b/shell/Library_kdebe.mk
@@ -45,9 +45,10 @@ $(eval $(call gb_Library_use_libraries,kdebe1,\
 	cppu \
 	cppuhelper \
 	sal \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,kdebe1))
+
 $(eval $(call gb_Library_set_componentfile,kdebe1,shell/source/backends/kdebe/kdebe1))
 
 $(eval $(call gb_Library_add_exception_objects,kdebe1,\
diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk
index 008a00481008..96022b731a24 100644
--- a/shell/Library_localebe.mk
+++ b/shell/Library_localebe.mk
@@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,localebe1,\
 	cppuhelper \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,localebe1))
+
 $(eval $(call gb_Library_set_componentfile,localebe1,shell/source/backends/localebe/localebe1))
 
 $(eval $(call gb_Library_add_exception_objects,localebe1,\
diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk
index 9057373a51a4..236cc6ce6e0a 100644
--- a/shell/Library_macbe.mk
+++ b/shell/Library_macbe.mk
@@ -38,9 +38,10 @@ $(eval $(call gb_Library_use_libraries,macbe1,\
 	cppu \
 	cppuhelper \
 	sal \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,macbe1))
+
 $(eval $(call gb_Library_set_componentfile,macbe1,shell/source/backends/macbe/macbe1))
 
 $(eval $(call gb_Library_add_objcxxobjects,macbe1,\
diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk
index c6c25e89a5b2..c95b2d1ee343 100644
--- a/shell/Library_recentfile.mk
+++ b/shell/Library_recentfile.mk
@@ -47,9 +47,10 @@ endif
 $(eval $(call gb_Library_use_libraries,recentfile,\
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,recentfile))
+
 $(eval $(call gb_Library_use_static_libraries,recentfile,\
 	shell_xmlparser \
 ))
diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk
index 252aa827d7c4..e16e957b7986 100644
--- a/shell/Library_syssh.mk
+++ b/shell/Library_syssh.mk
@@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,syssh,\
 	cppuhelper \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,syssh))
+
 $(eval $(call gb_Library_use_static_libraries,syssh,\
 	shell_xmlparser \
 ))
diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk
index 481728a3c4a8..b6ba2b4333fa 100644
--- a/shell/Library_syssh_win.mk
+++ b/shell/Library_syssh_win.mk
@@ -36,9 +36,10 @@ $(eval $(call gb_Library_use_libraries,syssh,\
 	sal \
 	shell32 \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,syssh))
+
 $(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh))
 
 $(eval $(call gb_Library_add_exception_objects,syssh,\
diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk
index a6ca92b2e391..a9472456af73 100644
--- a/shell/Library_tdebe.mk
+++ b/shell/Library_tdebe.mk
@@ -41,9 +41,10 @@ $(eval $(call gb_Library_use_libraries,tdebe1,\
 	cppu \
 	cppuhelper \
 	sal \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,tdebe1))
+
 $(eval $(call gb_Library_set_componentfile,tdebe1,shell/source/backends/kdebe/tdebe1))
 
 $(eval $(call gb_Library_add_exception_objects,tdebe1,\
diff --git a/shell/Library_wininetbe.mk b/shell/Library_wininetbe.mk
index d02c6cc5027b..c2dbd1341e30 100644
--- a/shell/Library_wininetbe.mk
+++ b/shell/Library_wininetbe.mk
@@ -34,9 +34,10 @@ $(eval $(call gb_Library_use_libraries,wininetbe1,\
 	cppuhelper \
 	sal \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,wininetbe1))
+
 $(eval $(call gb_Library_set_componentfile,wininetbe1,shell/source/backends/wininetbe/wininetbe1))
 
 $(eval $(call gb_Library_add_exception_objects,wininetbe1,\