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 --- cppu/CppunitTest_cppu_checkapi.mk | 2 -- cppu/CppunitTest_cppu_qa_any.mk | 2 -- cppu/CppunitTest_cppu_qa_recursion.mk | 2 -- cppu/CppunitTest_cppu_qa_reference.mk | 2 -- cppu/CppunitTest_cppu_qa_unotype.mk | 2 -- cppu/CppunitTest_cppu_test_cppumaker.mk | 2 -- cppu/Library_affine_uno.mk | 2 -- cppu/Library_cppu.mk | 2 -- cppu/Library_log_uno.mk | 2 -- cppu/Library_purpenvhelper.mk | 2 -- cppu/Library_unsafe_uno.mk | 2 -- 11 files changed, 22 deletions(-) (limited to 'cppu') diff --git a/cppu/CppunitTest_cppu_checkapi.mk b/cppu/CppunitTest_cppu_checkapi.mk index af9e7ea16b48..c47643aea6c5 100644 --- a/cppu/CppunitTest_cppu_checkapi.mk +++ b/cppu/CppunitTest_cppu_checkapi.mk @@ -52,6 +52,4 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_checkapi)) - # vim: set noet sw=4 ts=4: diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk index 2b5f4653ee32..0a0342e5162a 100644 --- a/cppu/CppunitTest_cppu_qa_any.mk +++ b/cppu/CppunitTest_cppu_qa_any.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_any)) - $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_any, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk index dffd187d01a1..20d70508ed86 100644 --- a/cppu/CppunitTest_cppu_qa_recursion.mk +++ b/cppu/CppunitTest_cppu_qa_recursion.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_recursion)) - $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_recursion, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk index d2b59a27d5f9..2531f4247119 100644 --- a/cppu/CppunitTest_cppu_qa_reference.mk +++ b/cppu/CppunitTest_cppu_qa_reference.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_reference)) - $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_reference, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk index ddc84583ff05..094e185fd9c6 100644 --- a/cppu/CppunitTest_cppu_qa_unotype.mk +++ b/cppu/CppunitTest_cppu_qa_unotype.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_qa_unotype)) - $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_unotype, \ cppu \ udkapi \ diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk index 7472a3619da2..f235be8f122a 100644 --- a/cppu/CppunitTest_cppu_test_cppumaker.mk +++ b/cppu/CppunitTest_cppu_test_cppumaker.mk @@ -37,8 +37,6 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,cppu_test_cppumaker)) - $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_test_cppumaker, \ cppu \ udkapi \ diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk index 644c82054e85..1edc2876947d 100644 --- a/cppu/Library_affine_uno.mk +++ b/cppu/Library_affine_uno.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,affine_uno,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,affine_uno)) - $(eval $(call gb_Library_add_exception_objects,affine_uno,\ cppu/source/AffineBridge/AffineBridge \ )) diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk index 4bdbb01d2565..d6dbc58c66ed 100644 --- a/cppu/Library_cppu.mk +++ b/cppu/Library_cppu.mk @@ -43,8 +43,6 @@ $(eval $(call gb_Library_use_libraries,cppu,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,cppu)) - $(eval $(call gb_Library_add_cobjects,cppu,\ cppu/source/uno/EnvDcp \ )) diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk index aacb8ed73495..e70d16b20fcb 100644 --- a/cppu/Library_log_uno.mk +++ b/cppu/Library_log_uno.mk @@ -36,8 +36,6 @@ $(eval $(call gb_Library_use_libraries,log_uno,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,log_uno)) - $(eval $(call gb_Library_add_exception_objects,log_uno,\ cppu/source/LogBridge/LogBridge \ )) diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk index de60f76c5ce0..bddf619b2884 100644 --- a/cppu/Library_purpenvhelper.mk +++ b/cppu/Library_purpenvhelper.mk @@ -41,8 +41,6 @@ $(eval $(call gb_Library_use_libraries,purpenvhelper,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,purpenvhelper)) - $(eval $(call gb_Library_add_exception_objects,purpenvhelper,\ cppu/source/helper/purpenv/helper_purpenv_Environment \ cppu/source/helper/purpenv/helper_purpenv_Mapping \ diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk index 9b3eb68418f4..f71fea1a1a88 100644 --- a/cppu/Library_unsafe_uno.mk +++ b/cppu/Library_unsafe_uno.mk @@ -35,8 +35,6 @@ $(eval $(call gb_Library_use_libraries,unsafe_uno,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,unsafe_uno)) - $(eval $(call gb_Library_add_exception_objects,unsafe_uno,\ cppu/source/UnsafeBridge/UnsafeBridge \ )) -- cgit v1.2.3