From f011af716e2978cbf9fcb7748dc868c503edddff 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
---
 fpicker/Library_fpicker.mk    | 2 --
 fpicker/Library_fps.mk        | 2 --
 fpicker/Library_fps_aqua.mk   | 2 --
 fpicker/Library_fps_odma.mk   | 2 --
 fpicker/Library_fps_office.mk | 2 --
 5 files changed, 10 deletions(-)

(limited to 'fpicker')

diff --git a/fpicker/Library_fpicker.mk b/fpicker/Library_fpicker.mk
index c18687564d4d..0a85dd4a00ae 100644
--- a/fpicker/Library_fpicker.mk
+++ b/fpicker/Library_fpicker.mk
@@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,fpicker,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_add_standard_system_libs,fpicker))
-
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_static_libraries,fpicker,\
 	odma_lib \
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index b3b3fc3a3d4a..eb1cd0c28687 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -66,8 +66,6 @@ $(eval $(call gb_Library_use_system_win32_libs,fps,\
 	uuid \
 ))
 
-$(eval $(call gb_Library_add_standard_system_libs,fps))
-
 ifeq ($(COM),MSC)
 $(eval $(call gb_Library_add_libs,fps,\
 	Delayimp.lib /DELAYLOAD:shell32.dll \
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index 1f1d3e4f2fd9..241be777d272 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -48,8 +48,6 @@ $(eval $(call gb_Library_use_libraries,fps_aqua,\
 	vcl \
 ))
 
-$(eval $(call gb_Library_add_standard_system_libs,fps_aqua))
-
 $(eval $(call gb_Library_add_objcxxobjects,fps_aqua,\
 	fpicker/source/aqua/AquaFilePickerDelegate \
 	fpicker/source/aqua/CFStringUtilities \
diff --git a/fpicker/Library_fps_odma.mk b/fpicker/Library_fps_odma.mk
index dbb1fe382339..63e9834fe068 100644
--- a/fpicker/Library_fps_odma.mk
+++ b/fpicker/Library_fps_odma.mk
@@ -44,8 +44,6 @@ $(eval $(call gb_Library_use_libraries,fps_odma,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_add_standard_system_libs,fps_odma))
-
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_static_libraries,fps_odma,\
 	odma_lib \
diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk
index 5582ffb076e2..58e3011fe7b6 100644
--- a/fpicker/Library_fps_office.mk
+++ b/fpicker/Library_fps_office.mk
@@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,fps_office,\
 	$(gb_UWINAPI) \
 ))
 
-$(eval $(call gb_Library_add_standard_system_libs,fps_office))
-
 $(eval $(call gb_Library_add_exception_objects,fps_office,\
 	fpicker/source/office/asyncfilepicker \
 	fpicker/source/office/commonpicker \
-- 
cgit