diff options
Diffstat (limited to 'sal')
34 files changed, 2 insertions, 66 deletions
diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk index fe58e255a2df..8d7bb0f84be4 100644 --- a/sal/CppunitTest_Module_DLL.mk +++ b/sal/CppunitTest_Module_DLL.mk @@ -39,6 +39,4 @@ $(eval $(call gb_CppunitTest_use_libraries,Module_DLL,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,Module_DLL)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_bytesequence.mk b/sal/CppunitTest_sal_bytesequence.mk index 222f77a7b53c..2add4a5cc033 100644 --- a/sal/CppunitTest_sal_bytesequence.mk +++ b/sal/CppunitTest_sal_bytesequence.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_bytesequence,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_bytesequence)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk index b61a739dbe2c..06e42a997987 100644 --- a/sal/CppunitTest_sal_checkapi.mk +++ b/sal/CppunitTest_sal_checkapi.mk @@ -47,6 +47,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_checkapi,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_checkapi)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_condition.mk b/sal/CppunitTest_sal_osl_condition.mk index 0dad649efa4c..4bf9cee70e4a 100644 --- a/sal/CppunitTest_sal_osl_condition.mk +++ b/sal/CppunitTest_sal_osl_condition.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_condition,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_condition)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk index ea64e55daca7..9b70af7e1e34 100644 --- a/sal/CppunitTest_sal_osl_file.mk +++ b/sal/CppunitTest_sal_osl_file.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_file,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_file)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk index af121a42f62e..1344908d6d46 100644 --- a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk +++ b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_getsystempathfromfileurl,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_getsystempathfromfileurl)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_module.mk b/sal/CppunitTest_sal_osl_module.mk index 93a24b4fdd8d..1748e1c4d992 100644 --- a/sal/CppunitTest_sal_osl_module.mk +++ b/sal/CppunitTest_sal_osl_module.mk @@ -40,6 +40,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_module,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_module)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_mutex.mk b/sal/CppunitTest_sal_osl_mutex.mk index 7768b1e5ce99..64312325b711 100644 --- a/sal/CppunitTest_sal_osl_mutex.mk +++ b/sal/CppunitTest_sal_osl_mutex.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_mutex, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_mutex)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_old_test_file.mk b/sal/CppunitTest_sal_osl_old_test_file.mk index 3b9040c2f519..1823ac353ef7 100644 --- a/sal/CppunitTest_sal_osl_old_test_file.mk +++ b/sal/CppunitTest_sal_osl_old_test_file.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_old_test_file,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_old_test_file)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_pipe.mk b/sal/CppunitTest_sal_osl_pipe.mk index a71937b15342..f3f454275a5e 100644 --- a/sal/CppunitTest_sal_osl_pipe.mk +++ b/sal/CppunitTest_sal_osl_pipe.mk @@ -38,6 +38,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_pipe, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_pipe)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_process.mk b/sal/CppunitTest_sal_osl_process.mk index 4ee7e3f6eba6..8065f7ec9de6 100644 --- a/sal/CppunitTest_sal_osl_process.mk +++ b/sal/CppunitTest_sal_osl_process.mk @@ -38,8 +38,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_process,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_process)) - # Depend on to be tested executable $(call gb_CppunitTest_get_target,sal_osl_process) : \ $(call gb_Executable_get_target,osl_process_child) diff --git a/sal/CppunitTest_sal_osl_profile.mk b/sal/CppunitTest_sal_osl_profile.mk index 87d587f6632f..1a29e3dedbea 100644 --- a/sal/CppunitTest_sal_osl_profile.mk +++ b/sal/CppunitTest_sal_osl_profile.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_profile, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_profile)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_security.mk b/sal/CppunitTest_sal_osl_security.mk index edb6a96ed88c..bc6fe2d1b6ef 100644 --- a/sal/CppunitTest_sal_osl_security.mk +++ b/sal/CppunitTest_sal_osl_security.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_security,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_security)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk index f7024cae6f07..b0c055f34227 100644 --- a/sal/CppunitTest_sal_osl_setthreadname.mk +++ b/sal/CppunitTest_sal_osl_setthreadname.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_setthreadname, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_setthreadname)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_osl_thread.mk b/sal/CppunitTest_sal_osl_thread.mk index 6feb7d59b584..d445bda953ad 100644 --- a/sal/CppunitTest_sal_osl_thread.mk +++ b/sal/CppunitTest_sal_osl_thread.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_osl_thread,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_osl_thread)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_alloc.mk b/sal/CppunitTest_sal_rtl_alloc.mk index 83405ab0a8b6..cde6e807466b 100644 --- a/sal/CppunitTest_sal_rtl_alloc.mk +++ b/sal/CppunitTest_sal_rtl_alloc.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_alloc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_alloc)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_cipher.mk b/sal/CppunitTest_sal_rtl_cipher.mk index ce2cc1da5a19..68cc9faa0b4b 100644 --- a/sal/CppunitTest_sal_rtl_cipher.mk +++ b/sal/CppunitTest_sal_rtl_cipher.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_cipher,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_cipher)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_crc32.mk b/sal/CppunitTest_sal_rtl_crc32.mk index 1a2390f5fd2e..01632a77e004 100644 --- a/sal/CppunitTest_sal_rtl_crc32.mk +++ b/sal/CppunitTest_sal_rtl_crc32.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_crc32,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_crc32)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_doublelock.mk b/sal/CppunitTest_sal_rtl_doublelock.mk index e4fd8f2bf4b4..97f17a2e64f7 100644 --- a/sal/CppunitTest_sal_rtl_doublelock.mk +++ b/sal/CppunitTest_sal_rtl_doublelock.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_doublelock,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_doublelock)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_locale.mk b/sal/CppunitTest_sal_rtl_locale.mk index ce1f0ab9ce1c..1742c1e775b1 100644 --- a/sal/CppunitTest_sal_rtl_locale.mk +++ b/sal/CppunitTest_sal_rtl_locale.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_locale,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_locale)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_math.mk b/sal/CppunitTest_sal_rtl_math.mk index c502ab226659..c854f4cd756d 100644 --- a/sal/CppunitTest_sal_rtl_math.mk +++ b/sal/CppunitTest_sal_rtl_math.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_math, \ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_math)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_ostringbuffer.mk b/sal/CppunitTest_sal_rtl_ostringbuffer.mk index 8c38783b7a93..1bb445893a94 100644 --- a/sal/CppunitTest_sal_rtl_ostringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_ostringbuffer.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_ostringbuffer,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_ostringbuffer)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_oustringbuffer.mk b/sal/CppunitTest_sal_rtl_oustringbuffer.mk index bb316eeda619..e28d9f453fa0 100644 --- a/sal/CppunitTest_sal_rtl_oustringbuffer.mk +++ b/sal/CppunitTest_sal_rtl_oustringbuffer.mk @@ -40,6 +40,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustringbuffer,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_oustringbuffer)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk index 67299a3ab9d2..4d4f59828dab 100644 --- a/sal/CppunitTest_sal_rtl_strings.mk +++ b/sal/CppunitTest_sal_rtl_strings.mk @@ -43,8 +43,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_strings,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_strings)) - # The test uses O(U)String capabilities that dlopen this lib ifneq ($(OS),ANDROID) # Except that on Android we don't build it separately diff --git a/sal/CppunitTest_sal_rtl_uri.mk b/sal/CppunitTest_sal_rtl_uri.mk index 67ce1eab2732..65b6713a6608 100644 --- a/sal/CppunitTest_sal_rtl_uri.mk +++ b/sal/CppunitTest_sal_rtl_uri.mk @@ -25,8 +25,6 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uri,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_uri)) - # The test uses O(U)String capabilities that dlopen this lib ifneq ($(OS),ANDROID) # Except that on Android we don't build it separately diff --git a/sal/CppunitTest_sal_rtl_uuid.mk b/sal/CppunitTest_sal_rtl_uuid.mk index 74ea9e057f6c..df0e6858cd9d 100644 --- a/sal/CppunitTest_sal_rtl_uuid.mk +++ b/sal/CppunitTest_sal_rtl_uuid.mk @@ -24,6 +24,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_uuid,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_rtl_uuid)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_tcwf.mk b/sal/CppunitTest_sal_tcwf.mk index fd202e2adec8..729a26467b80 100644 --- a/sal/CppunitTest_sal_tcwf.mk +++ b/sal/CppunitTest_sal_tcwf.mk @@ -37,6 +37,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_tcwf,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_tcwf)) - # vim: set noet sw=4 ts=4: diff --git a/sal/CppunitTest_sal_types.mk b/sal/CppunitTest_sal_types.mk index 942e8f318c35..5fb59d18d1c5 100644 --- a/sal/CppunitTest_sal_types.mk +++ b/sal/CppunitTest_sal_types.mk @@ -36,6 +36,4 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_types,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_CppunitTest_add_standard_system_libs,sal_types)) - # vim: set noet sw=4 ts=4: diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk index 9cf275e91476..b5826942378f 100644 --- a/sal/Executable_cppunittester.mk +++ b/sal/Executable_cppunittester.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Executable_use_libraries,cppunit/cppunittester,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,cppunit/cppunittester)) - $(eval $(call gb_Executable_use_external,cppunit/cppunittester,cppunit)) $(eval $(call gb_Executable_add_exception_objects,cppunit/cppunittester,\ diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk index 3f3cce24c160..47e057b689e9 100644 --- a/sal/Executable_osl_process_child.mk +++ b/sal/Executable_osl_process_child.mk @@ -34,8 +34,6 @@ $(eval $(call gb_Executable_use_libraries,osl_process_child,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Executable_add_standard_system_libs,osl_process_child)) - $(eval $(call gb_Executable_add_exception_objects,osl_process_child,\ sal/qa/osl/process/osl_process_child \ )) diff --git a/sal/Library_lo-bootstrap.mk b/sal/Library_lo-bootstrap.mk index dea6bb4ab30c..958b0f18e5cf 100644 --- a/sal/Library_lo-bootstrap.mk +++ b/sal/Library_lo-bootstrap.mk @@ -28,6 +28,8 @@ $(eval $(call gb_Library_Library,lo-bootstrap)) # We explicitly *don't* want gb_STDLIBS to be linked here +$(eval $(call gb_Library_disable_standard_system_libs,lo-bootstrap)) + $(eval $(call gb_Library_add_libs,lo-bootstrap,\ -llog \ -landroid \ diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index ecec9fffd76c..73335befab10 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -88,8 +88,6 @@ $(eval $(call gb_Library_add_libs,sal,\ ) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sal)) - ifeq ($(OS),MACOSX) $(eval $(call gb_Library_use_system_darwin_frameworks,sal,\ Carbon \ diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk index c50fa94ce6e4..5d5d40e0bb1b 100644 --- a/sal/Library_sal_textenc.mk +++ b/sal/Library_sal_textenc.mk @@ -32,8 +32,6 @@ $(eval $(call gb_Library_use_libraries,sal_textenc,\ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_standard_system_libs,sal_textenc)) - $(eval $(call gb_Library_add_defs,sal_textenc,\ $(LFS_CFLAGS) \ )) diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk index 75a3a9cffca4..f62e043be150 100644 --- a/sal/Library_uwinapi.mk +++ b/sal/Library_uwinapi.mk @@ -37,8 +37,6 @@ $(eval $(call gb_Library_use_system_win32_libs,uwinapi,\ ) \ )) -$(eval $(call gb_Library_add_standard_system_libs,uwinapi)) - $(eval $(call gb_Library_add_defs,uwinapi,\ $(if $(filter $(COM),GCC), \ -Wno-unused-parameter -Wno-return-type) \ |