Link most libs and executables with gb_STDLIBS as presumably is intended

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,\

bean/Library_officebean.mk

+# -*- 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:

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,\

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,\

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,\

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 \
 ))

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

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,\

desktop/Executable_quickstart.mk

@@ -39,6 +39,7 @@ $(eval $(call gb_Executable_add_linked_libs,quickstart,\
     ole32 \
     oleaut32 \
     shell32 \
+    $(gb_STDLIBS) \
 ))
 
 ifeq ($(COM),GCC)

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 \

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 \

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 \

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 \

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 \

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),\

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,\

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 \

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 \

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),\

desktop/Library_deploymentgui.mk

@@ -56,6 +56,7 @@ $(eval $(call gb_Library_add_linked_libs,deploymentgui,\
     ucbhelper \
     utl \
     vcl \
+    $(gb_STDLIBS) \
 ))
 
 ifeq ($(OS),WNT)

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,\

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,\

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,\

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))

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,\

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))

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))

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,\

eventattacher/Library_evtatt.mk

+# -*- 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:

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,\

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))) \
 ))

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 \
 ))

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 \
 ))

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))) \
 ))

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 \

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,\

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,\

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,\

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))) \
 ))

o3tl/CppunitTest_o3tl_tests.mk

+# -*- 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,\

officecfg/CppunitTest_officecfg_cppheader_test.mk

+## -*- 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:

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,\

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 \

scaddins/Library_analysis.mk

@@ -46,6 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,analysis,\
 	cppuhelper \
 	sal \
 	tl \
+    $(gb_STDLIBS) \
 ))
 
 ifeq ($(GUI),WNT)

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,\

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,\

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,\

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,\

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,\

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,\

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,\

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,\

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,\

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,\