From 5032dc0fc339ba6b200e80a5482cc86e00662a0b Mon Sep 17 00:00:00 2001 From: Michael Stahl 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 --- cppuhelper/CppunitTest_cppuhelper_checkapi.mk | 2 -- cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk | 2 -- cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk | 2 -- cppuhelper/CppunitTest_cppuhelper_qa_weak.mk | 2 -- cppuhelper/Library_cppuhelper.mk | 2 -- 5 files changed, 10 deletions(-) (limited to 'cppuhelper') diff --git a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk index e5ef4b2b895c..68fd0ec4bc1f 100644 --- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk +++ b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk @@ -52,6 +52,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_checkapi)) - # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk index 7b50f334646d..b176884a0616 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk @@ -42,6 +42,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_cppu_ifcontainer)) - # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk index ee832217dd03..d67382b75d8e 100644 --- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk +++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk @@ -38,6 +38,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_cppu_unourl)) - # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk index 6dd88b393cb1..f9fe2742186b 100644 --- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk +++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk @@ -42,6 +42,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppuhelper_qa_weak)) - # vim: set noet sw=4 ts=4: diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk index fcb37211671f..59020c27ef96 100644 --- a/cppuhelper/Library_cppuhelper.mk +++ b/cppuhelper/Library_cppuhelper.mk @@ -51,8 +51,6 @@ $(eval $(call gb_Library_use_libraries,cppuhelper,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cppuhelper)) - $(eval $(call gb_Library_add_cobjects,cppuhelper,\ cppuhelper/source/findsofficepath \ )) -- cgit