From 816ec4b0933e36ac468230365359c3b9d8d52986 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
---
 basic/CppunitTest_basic_enable.mk        | 3 ++-
 basic/CppunitTest_basic_nested_struct.mk | 3 ++-
 basic/CppunitTest_basic_scanner.mk       | 3 ++-
 basic/Library_sb.mk                      | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'basic')

diff --git a/basic/CppunitTest_basic_enable.mk b/basic/CppunitTest_basic_enable.mk
index 3bd2bc87337a..c09080ce2276 100644
--- a/basic/CppunitTest_basic_enable.mk
+++ b/basic/CppunitTest_basic_enable.mk
@@ -29,9 +29,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \
     xmlscript \
     test \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_enable))
+
 ifeq ($(GUI),WNT)
 $(eval $(call gb_CppunitTest_use_libraries,basic_enable, \
 	oleaut32 \
diff --git a/basic/CppunitTest_basic_nested_struct.mk b/basic/CppunitTest_basic_nested_struct.mk
index fcadba3b0c84..e43404a27094 100644
--- a/basic/CppunitTest_basic_nested_struct.mk
+++ b/basic/CppunitTest_basic_nested_struct.mk
@@ -30,9 +30,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
     xmlscript \
     test \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_nested_struct))
+
 ifeq ($(GUI),WNT)
 $(eval $(call gb_CppunitTest_use_libraries,basic_nested_struct, \
 	oleaut32 \
diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk
index af058148e32f..36806d0e276d 100644
--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@@ -30,9 +30,10 @@ $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
     vcl \
     xmlscript \
 	$(gb_UWINAPI) \
-    $(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_CppunitTest_add_standard_system_libs,basic_scanner))
+
 ifeq ($(GUI),WNT)
 $(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
 	oleaut32 \
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index de50d0c70f9f..c29a58c4b366 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -50,9 +50,10 @@ $(eval $(call gb_Library_use_libraries,sb,\
 	vcl \
 	xmlscript \
 	$(gb_UWINAPI) \
-	$(gb_STDLIBS) \
 ))
 
+$(eval $(call gb_Library_add_standard_system_libs,sb))
+
 ifneq ($(DISABLE_SCRIPTING),TRUE)
 
 $(eval $(call gb_Library_add_exception_objects,sb,\
-- 
cgit