diff options
54 files changed, 117 insertions, 12 deletions
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index cbc702b72adc..2dc3abf5a0ad 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,animcore,\ cppu \ cppuhelper \ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,animcore,\ diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index bcc1ae64675c..bef4ac271d21 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- # # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # @@ -62,3 +63,8 @@ $(eval $(call gb_Library_add_ldflags,officebean,\ endif +$(eval $(call gb_Library_add_linked_libs,officebean,\ + $(gb_STDLIBS) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk index 51b5e839528c..b78a9b418925 100644 --- a/binaryurp/CppunitTest_binaryurp_test-cache.mk +++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk @@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache)) $(eval $(call gb_CppunitTest_add_linked_libs,binaryurp_test-cache,\ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_CppunitTest_add_exception_objects,binaryurp_test-cache,\ diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk index 0e0b76911b71..4b6cc3cfff13 100644 --- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk +++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk @@ -33,6 +33,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,binaryurp_test-unmarshal,\ cppuhelper \ sal \ salhelper \ + $(gb_STDLIBS) \ )) $(eval $(call gb_CppunitTest_add_library_objects,binaryurp_test-unmarshal,\ diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk index ff06941aeb5e..c86febe3be20 100644 --- a/binaryurp/Library_binaryurp.mk +++ b/binaryurp/Library_binaryurp.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_linked_libs,binaryurp,\ cppuhelper \ sal \ salhelper \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,binaryurp,\ diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk index 1db348367ef7..d7f4d73f8926 100644 --- a/desktop/Executable_crashrep.com.mk +++ b/desktop/Executable_crashrep.com.mk @@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\ $(LFS_CFLAGS) \ )) +$(eval $(call gb_Executable_add_linked_libs,crashrep_com,\ + $(gb_STDLIBS) \ +)) + $(eval $(call gb_Executable_add_exception_objects,crashrep_com,\ desktop/win32/source/guistdio/guistdio \ )) diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk index c05d4a45f7a6..f1801e6af4b3 100644 --- a/desktop/Executable_officeloader.mk +++ b/desktop/Executable_officeloader.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Executable_set_include,officeloader,\ $(eval $(call gb_Executable_add_linked_libs,officeloader,\ sal \ + $(gb_STDLIBS) \ )) # I'm not suer wht was the intent, but that break the link diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk index d18cfcc94a61..698b58a2da30 100644 --- a/desktop/Executable_oosplash.mk +++ b/desktop/Executable_oosplash.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Executable_set_include,oosplash,\ $(eval $(call gb_Executable_add_linked_libs,oosplash,\ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Executable_add_cobjects,oosplash,\ diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk index 470497d07e39..7da506601cd9 100644 --- a/desktop/Executable_quickstart.mk +++ b/desktop/Executable_quickstart.mk @@ -39,6 +39,7 @@ $(eval $(call gb_Executable_add_linked_libs,quickstart,\ ole32 \ oleaut32 \ shell32 \ + $(gb_STDLIBS) \ )) ifeq ($(COM),GCC) diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk index 1d6ff3839d39..37738a067e2c 100644 --- a/desktop/Executable_sbase.mk +++ b/desktop/Executable_sbase.mk @@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,sbase,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_linked_libs,sbase,\ + $(gb_STDLIBS) \ +)) + $(eval $(call gb_Executable_add_noexception_objects,sbase,\ desktop/win32/source/applauncher/launcher \ desktop/win32/source/applauncher/sbase \ diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk index 47dc397885d7..ec7274238806 100644 --- a/desktop/Executable_scalc.mk +++ b/desktop/Executable_scalc.mk @@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,scalc,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_linked_libs,scalc,\ + $(gb_STDLIBS) \ +)) + $(eval $(call gb_Executable_add_noexception_objects,scalc,\ desktop/win32/source/applauncher/launcher \ desktop/win32/source/applauncher/scalc \ diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk index 87de0eb93f1d..24fec0e9c83d 100644 --- a/desktop/Executable_sdraw.mk +++ b/desktop/Executable_sdraw.mk @@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,sdraw,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_linked_libs,sdraw,\ + $(gb_STDLIBS) \ +)) + $(eval $(call gb_Executable_add_noexception_objects,sdraw,\ desktop/win32/source/applauncher/launcher \ desktop/win32/source/applauncher/sdraw \ diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk index d698df259c30..f0b72411d521 100644 --- a/desktop/Executable_simpress.mk +++ b/desktop/Executable_simpress.mk @@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,simpress,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_linked_libs,simpress,\ + $(gb_STDLIBS) \ +)) + $(eval $(call gb_Executable_add_noexception_objects,simpress,\ desktop/win32/source/applauncher/launcher \ desktop/win32/source/applauncher/simpress \ diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk index a7b69e570a2a..ff73c2a2ca05 100644 --- a/desktop/Executable_smath.mk +++ b/desktop/Executable_smath.mk @@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,smath,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_linked_libs,smath,\ + $(gb_STDLIBS) \ +)) + $(eval $(call gb_Executable_add_noexception_objects,smath,\ desktop/win32/source/applauncher/launcher \ desktop/win32/source/applauncher/smath \ diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index a4aa5738e308..456171d774b6 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -43,6 +43,7 @@ $(eval $(call gb_Executable_set_include,$(sofficebin),\ $(eval $(call gb_Executable_add_linked_libs,$(sofficebin),\ sal \ sofficeapp \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Executable_add_cobjects,$(sofficebin),\ diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index 115ecb777a93..f768d99041d1 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Executable_add_linked_libs,soffice,\ advapi32 \ shell32 \ shlwapi \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Executable_add_linked_static_libs,soffice,\ diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk index 3a87a313c4c7..00d085204720 100644 --- a/desktop/Executable_sweb.mk +++ b/desktop/Executable_sweb.mk @@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,sweb,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_linked_libs,sweb,\ + $(gb_STDLIBS) \ +)) + $(eval $(call gb_Executable_add_noexception_objects,sweb,\ desktop/win32/source/applauncher/launcher \ desktop/win32/source/applauncher/sweb \ diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk index 04624d652bfc..7f5e8d9bdb1f 100644 --- a/desktop/Executable_swriter.mk +++ b/desktop/Executable_swriter.mk @@ -37,6 +37,10 @@ $(eval $(call gb_Executable_add_defs,swriter,\ -DUNICODE \ )) +$(eval $(call gb_Executable_add_linked_libs,swriter,\ + $(gb_STDLIBS) \ +)) + $(eval $(call gb_Executable_add_noexception_objects,swriter,\ desktop/win32/source/applauncher/launcher \ desktop/win32/source/applauncher/swriter \ diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index 759a4e90147b..464824fa2f75 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -45,6 +45,7 @@ $(eval $(call gb_Executable_add_linked_libs,$(unopkgbin),\ sal \ tl \ unopkgapp \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Executable_add_cobjects,$(unopkgbin),\ diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk index 28b9b4a63593..2ce86226d8f3 100644 --- a/desktop/Library_deploymentgui.mk +++ b/desktop/Library_deploymentgui.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,deploymentgui,\ ucbhelper \ utl \ vcl \ + $(gb_STDLIBS) \ )) ifeq ($(OS),WNT) diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index fc1a175d5e55..d4bf21128a27 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_add_linked_libs,deploymentmisc,\ ucbhelper \ utl \ xcr \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_externals,deploymentmisc,\ diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk index 6bdf9268d213..43a860bc12c5 100644 --- a/desktop/Library_migrationoo2.mk +++ b/desktop/Library_migrationoo2.mk @@ -44,6 +44,7 @@ $(eval $(call gb_Library_add_linked_libs,migrationoo2,\ sal \ tl \ utl \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_externals,migrationoo2,\ diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk index a50067726dd6..e315a8470dd4 100644 --- a/desktop/Library_migrationoo3.mk +++ b/desktop/Library_migrationoo3.mk @@ -42,6 +42,7 @@ $(eval $(call gb_Library_add_linked_libs,migrationoo3,\ sal \ tl \ utl \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_externals,migrationoo3,\ diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk index c60db2574c77..e556cb724d44 100644 --- a/desktop/Library_offacc.mk +++ b/desktop/Library_offacc.mk @@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_linked_libs,offacc,\ cppu \ cppuhelper \ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_set_componentfile,offacc,desktop/source/offacc/offacc)) diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index a0f65b420336..cd57646baede 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -65,6 +65,7 @@ $(eval $(call gb_Library_add_linked_libs,sofficeapp,\ ucbhelper \ utl \ vcl \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk index da9dc4853666..be7de6deef47 100644 --- a/desktop/Library_spl.mk +++ b/desktop/Library_spl.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,spl,\ ucbhelper \ utl \ vcl \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_set_componentfile,spl,desktop/source/splash/spl)) diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk index e549a3eb67fe..82b1ecc03ae7 100644 --- a/desktop/Library_spl_unx.mk +++ b/desktop/Library_spl_unx.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_add_linked_libs,spl_unx,\ cppu \ cppuhelper \ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_set_componentfile,spl_unx,desktop/unx/splash/splash)) diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk index f2233ec8726f..d2f9abbb4491 100644 --- a/desktop/Library_unopkgapp.mk +++ b/desktop/Library_unopkgapp.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,unopkgapp,\ ucbhelper \ utl \ vcl \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,unopkgapp,\ diff --git a/eventattacher/Library_evtatt.mk b/eventattacher/Library_evtatt.mk index 7c3f9ef43d1a..8a1ca73c90e6 100644 --- a/eventattacher/Library_evtatt.mk +++ b/eventattacher/Library_evtatt.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # @@ -35,6 +36,7 @@ $(eval $(call gb_Library_add_linked_libs,evtatt,\ cppuhelper \ cppu \ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,evtatt,\ @@ -44,3 +46,5 @@ $(eval $(call gb_Library_add_exception_objects,evtatt,\ $(eval $(call gb_Library_add_api,evtatt,\ udkapi \ )) + +# vim: set ts=4 sw=4 et: diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk index 45df847c1192..153b991af278 100644 --- a/framework/Library_lomenubar.mk +++ b/framework/Library_lomenubar.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,lomenubar,\ cppu \ cppuhelper \ X11 \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,lomenubar,\ diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk index 7f00e8bdcf63..cbf147b88e3c 100644 --- a/i18npool/Library_collator_data.mk +++ b/i18npool/Library_collator_data.mk @@ -30,6 +30,10 @@ $(eval $(call gb_Library_Library,collator_data)) $(eval $(call gb_Library_add_package_headers,collator_data,i18npool_generated)) +$(eval $(call gb_Library_add_linked_libs,collator_data,\ + $(gb_STDLIBS) \ +)) + $(eval $(call gb_Library_add_generated_exception_objects,collator_data,\ $(subst $(WORKDIR)/,,$(basename $(wildcard $(WORKDIR)/CustomTarget/i18npool/source/collator/collator_*.cxx))) \ )) diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk index be52e0f65252..9c388123e8eb 100644 --- a/i18npool/Library_dict_ja.mk +++ b/i18npool/Library_dict_ja.mk @@ -30,6 +30,10 @@ $(eval $(call gb_Library_Library,dict_ja)) $(eval $(call gb_Library_add_package_headers,dict_ja,i18npool_generated)) +$(eval $(call gb_Library_add_linked_libs,dict_ja,\ + $(gb_STDLIBS) \ +)) + $(eval $(call gb_Library_add_generated_exception_objects,dict_ja,\ CustomTarget/i18npool/source/breakiterator/data/dict_ja \ )) diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk index a29b2789b35e..5567780c5d1d 100644 --- a/i18npool/Library_dict_zh.mk +++ b/i18npool/Library_dict_zh.mk @@ -30,6 +30,10 @@ $(eval $(call gb_Library_Library,dict_zh)) $(eval $(call gb_Library_add_package_headers,dict_zh,i18npool_generated)) +$(eval $(call gb_Library_add_linked_libs,dict_zh,\ + $(gb_STDLIBS) \ +)) + $(eval $(call gb_Library_add_generated_exception_objects,dict_zh,\ CustomTarget/i18npool/source/breakiterator/data/dict_zh \ )) diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk index 43d4c520d44a..dd057d32d89b 100644 --- a/i18npool/Library_index_data.mk +++ b/i18npool/Library_index_data.mk @@ -30,6 +30,10 @@ $(eval $(call gb_Library_Library,index_data)) $(eval $(call gb_Library_add_package_headers,index_data,i18npool_generated)) +$(eval $(call gb_Library_add_linked_libs,index_data,\ + $(gb_STDLIBS) \ +)) + $(eval $(call gb_Library_add_generated_exception_objects,index_data,\ $(subst $(WORKDIR)/,,$(basename $(wildcard $(WORKDIR)/CustomTarget/i18npool/source/indexentry/*.cxx))) \ )) diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk index 2a09257b483c..89534ed2d176 100644 --- a/i18npool/Library_localedata_en.mk +++ b/i18npool/Library_localedata_en.mk @@ -30,6 +30,10 @@ $(eval $(call gb_Library_Library,localedata_en)) $(eval $(call gb_Library_add_package_headers,localedata_en,i18npool_generated)) +$(eval $(call gb_Library_add_linked_libs,localedata_en,\ + $(gb_STDLIBS) \ +)) + $(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\ CustomTarget/i18npool/source/localedata/localedata_en_AU \ CustomTarget/i18npool/source/localedata/localedata_en_BZ \ diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk index c429fc8e77d9..a15db63cf167 100644 --- a/i18npool/Library_localedata_es.mk +++ b/i18npool/Library_localedata_es.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_es)) $(eval $(call gb_Library_add_linked_libs,localedata_es,\ localedata_en \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_generated_exception_objects,localedata_es,\ diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index fecdcec48785..d879dc22ff77 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_euro)) $(eval $(call gb_Library_add_linked_libs,localedata_euro,\ localedata_en \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\ diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk index a4c5bc7d9ebb..6ab62a59bec8 100644 --- a/i18npool/Library_localedata_others.mk +++ b/i18npool/Library_localedata_others.mk @@ -30,6 +30,7 @@ $(eval $(call gb_Library_Library,localedata_others)) $(eval $(call gb_Library_add_linked_libs,localedata_others,\ localedata_en \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\ diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk index 3b9213c32710..45ae317cea57 100644 --- a/i18npool/Library_textconv_dict.mk +++ b/i18npool/Library_textconv_dict.mk @@ -40,6 +40,10 @@ $(eval $(call gb_Library_add_api,textconv_dict,\ offapi \ )) +$(eval $(call gb_Library_add_linked_libs,textconv_dict,\ + $(gb_STDLIBS) \ +)) + $(eval $(call gb_Library_add_generated_exception_objects,textconv_dict,\ $(subst $(WORKDIR)/,,$(basename $(wildcard $(WORKDIR)/CustomTarget/i18npool/source/textconversion/*.cxx))) \ )) diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk index dc3127c4bac2..8657c6084a91 100644 --- a/o3tl/CppunitTest_o3tl_tests.mk +++ b/o3tl/CppunitTest_o3tl_tests.mk @@ -1,3 +1,4 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,6 +32,7 @@ $(eval $(call gb_CppunitTest_add_package_headers,o3tl_tests,o3tl_inc)) $(eval $(call gb_CppunitTest_add_linked_libs,o3tl_tests,\ sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_CppunitTest_add_exception_objects,o3tl_tests,\ diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk index 65f0682ab045..249807198db0 100644 --- a/officecfg/CppunitTest_officecfg_cppheader_test.mk +++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk @@ -1,3 +1,4 @@ +## -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- ## ## Version: MPL 1.1 / GPLv3+ / LGPLv3+ ## @@ -28,6 +29,10 @@ $(eval $(call gb_CppunitTest_CppunitTest,officecfg_cppheader_test)) +$(eval $(call gb_CppunitTest_add_linked_libs,officecfg_cppheader_test,\ + $(gb_STDLIBS) \ +)) + $(eval $(call gb_CppunitTest_add_exception_objects,officecfg_cppheader_test, \ officecfg/qa/cppheader \ )) @@ -37,3 +42,5 @@ $(eval $(call gb_CppunitTest_add_api,officecfg_cppheader_test, \ )) $(eval $(call gb_CppunitTest_add_package_headers,officecfg_cppheader_test,officecfg_cppheader)) + +## vim: set noet sw=4 ts=4: diff --git a/sal/Library_lo-bootstrap.mk b/sal/Library_lo-bootstrap.mk index f334eedb8499..a59ad5b76abd 100644 --- a/sal/Library_lo-bootstrap.mk +++ b/sal/Library_lo-bootstrap.mk @@ -25,18 +25,12 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -# Too many warnings from android_native_app_glue.[ch] -EXTERNAL_WARNINGS_NOT_ERRORS = TRUE - $(eval $(call gb_Library_Library,lo-bootstrap)) -# We don't want to link liblo-bootstrap.so against -# libgnustl_shared.so. The Android dynamic linker won't find it -# anyway. One very point of liblo-bootstrap is its wrapper for -# dlopen() that searches also in the app's lib folder for needed -# shared libraries. -$(eval $(call gb_Library_add_libs,lo-bootstrap,\ - -llog -landroid \ +# We explicitly *don't* want gb_STDLIBS to be linked here +$(eval $(call gb_Library_add_linked_libs,lo-bootstrap,\ + log \ + android \ )) $(eval $(call gb_Library_add_cobjects,lo-bootstrap,\ diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 4bf8df18c6f5..93bc64649a88 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -55,8 +55,10 @@ $(eval $(call gb_Library_add_defs,sal,\ $(eval $(call gb_Library_add_linked_libs,sal,\ $(if $(filter $(GUI),UNX), \ - dl \ - pthread \ + $(if $(filter $(OS),ANDROID),, \ + dl \ + pthread \ + ) \ ) \ $(if $(filter $(OS),SOLARIS), \ nsl \ diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk index eecfc7f10e61..8c5e1ac55e5b 100644 --- a/scaddins/Library_analysis.mk +++ b/scaddins/Library_analysis.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,analysis,\ cppuhelper \ sal \ tl \ + $(gb_STDLIBS) \ )) ifeq ($(GUI),WNT) diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk index 6e4b11d04ed4..6366dcdf4d7f 100644 --- a/scaddins/Library_date.mk +++ b/scaddins/Library_date.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,date,\ cppuhelper \ sal \ tl \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,date,\ diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index e5239f83915f..9b3b1bee40cf 100644 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\ utl \ vcl \ sfx \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_externals,qstart_gtk,\ diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index c63aa5acc3d5..3ccf55210adb 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -59,6 +59,7 @@ $(eval $(call gb_Library_add_linked_libs,sm,\ utl \ vcl \ xo \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,sm,\ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 857d7690ecc0..260dce26adf4 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -73,6 +73,7 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\ Xext \ SM \ ICE \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_externals,vclplug_kde,\ diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk index a6ab35905b8f..6828936b1113 100644 --- a/vcl/Library_vclplug_kde4.mk +++ b/vcl/Library_vclplug_kde4.mk @@ -76,6 +76,7 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\ Xext \ SM \ ICE \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_use_externals,vclplug_kde4,\ diff --git a/writerperfect/Library_cdrimport.mk b/writerperfect/Library_cdrimport.mk index b1511f850858..f05990ddd920 100644 --- a/writerperfect/Library_cdrimport.mk +++ b/writerperfect/Library_cdrimport.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,cdrimport,\ tl \ utl \ xo \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_linked_static_libs,cdrimport,\ diff --git a/writerperfect/Library_msworks.mk b/writerperfect/Library_msworks.mk index a00106c810c5..5b1007f10464 100644 --- a/writerperfect/Library_msworks.mk +++ b/writerperfect/Library_msworks.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_add_linked_libs,msworks,\ tl \ utl \ xo \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_linked_static_libs,msworks,\ diff --git a/writerperfect/Library_visioimport.mk b/writerperfect/Library_visioimport.mk index e32ea32ddf2a..00361107604e 100644 --- a/writerperfect/Library_visioimport.mk +++ b/writerperfect/Library_visioimport.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,visioimport,\ tl \ utl \ xo \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_linked_static_libs,visioimport,\ diff --git a/writerperfect/Library_wpft.mk b/writerperfect/Library_wpft.mk index ecc43862437d..51c188d9473d 100644 --- a/writerperfect/Library_wpft.mk +++ b/writerperfect/Library_wpft.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_add_linked_libs,wpft,\ ucbhelper \ utl \ xo \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_linked_static_libs,wpft,\ diff --git a/writerperfect/Library_wpgimport.mk b/writerperfect/Library_wpgimport.mk index d83cc98f29d7..7d7883bcd63c 100644 --- a/writerperfect/Library_wpgimport.mk +++ b/writerperfect/Library_wpgimport.mk @@ -48,6 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,wpgimport,\ tl \ utl \ xo \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_linked_static_libs,wpgimport,\ |