From 5032dc0fc339ba6b200e80a5482cc86e00662a0b Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Fri, 28 Sep 2012 16:29:24 +0200
Subject: gbuild: invert handling of standard system libraries:

Always link in gb_STDLIBS, except when the library explicitly opts out
with gb_LinkTarget_disable_standard_system_libs.

Change-Id: I489a99114fbfa46d0421a27cf6c7b899dc268a4a
---
 scripting/Library_basprov.mk         | 2 --
 scripting/Library_dlgprov.mk         | 2 --
 scripting/Library_protocolhandler.mk | 2 --
 scripting/Library_scriptframe.mk     | 2 --
 scripting/Library_stringresource.mk  | 2 --
 scripting/Library_vbaevents.mk       | 2 --
 6 files changed, 12 deletions(-)

(limited to 'scripting')

diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk
index 8941931b7ee4..602aa1df85af 100644
--- a/scripting/Library_basprov.mk
+++ b/scripting/Library_basprov.mk
@@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,basprov,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_add_standard_system_libs,basprov))
-
 $(eval $(call gb_Library_add_exception_objects,basprov,\
 	scripting/source/basprov/baslibnode \
 	scripting/source/basprov/basmethnode \
diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk
index 6ffb4fe0d029..c8efe563bb34 100644
--- a/scripting/Library_dlgprov.mk
+++ b/scripting/Library_dlgprov.mk
@@ -56,8 +56,6 @@ $(eval $(call gb_Library_use_libraries,dlgprov,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_add_standard_system_libs,dlgprov))
-
 $(eval $(call gb_Library_add_exception_objects,dlgprov,\
 	scripting/source/dlgprov/DialogModelProvider \
 	scripting/source/dlgprov/dlgevtatt  \
diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk
index a9ca47acfd26..291b1ecb03c1 100644
--- a/scripting/Library_protocolhandler.mk
+++ b/scripting/Library_protocolhandler.mk
@@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,protocolhandler,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_add_standard_system_libs,protocolhandler))
-
 $(eval $(call gb_Library_add_exception_objects,protocolhandler,\
 	scripting/source/protocolhandler/scripthandler \
 ))
diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk
index 025c5952cd8d..2ecc9ec70a48 100644
--- a/scripting/Library_scriptframe.mk
+++ b/scripting/Library_scriptframe.mk
@@ -47,8 +47,6 @@ $(eval $(call gb_Library_use_libraries,scriptframe,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_add_standard_system_libs,scriptframe))
-
 $(eval $(call gb_Library_add_exception_objects,scriptframe,\
 	scripting/source/provider/ActiveMSPList \
 	scripting/source/provider/BrowseNodeFactoryImpl \
diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk
index 3ec938c4cb52..29c5eb9e0a3b 100644
--- a/scripting/Library_stringresource.mk
+++ b/scripting/Library_stringresource.mk
@@ -45,8 +45,6 @@ $(eval $(call gb_Library_use_libraries,stringresource,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_add_standard_system_libs,stringresource))
-
 $(eval $(call gb_Library_add_exception_objects,stringresource,\
 	scripting/source/stringresource/stringresource \
 ))
diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk
index e469d786e4e0..acab48fe2811 100644
--- a/scripting/Library_vbaevents.mk
+++ b/scripting/Library_vbaevents.mk
@@ -53,8 +53,6 @@ $(eval $(call gb_Library_use_libraries,vbaevents,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_add_standard_system_libs,vbaevents))
-
 $(eval $(call gb_Library_add_exception_objects,vbaevents,\
 	scripting/source/vbaevents/eventhelper \
 	scripting/source/vbaevents/service \
-- 
cgit