summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comphelper/Library_comphelp.mk9
-rw-r--r--sot/Library_sot.mk10
-rw-r--r--svl/Library_fsstorage.mk9
-rw-r--r--svl/Library_passwordcontainer.mk2
-rw-r--r--svl/Library_svl.mk10
-rw-r--r--svtools/Executable_bmp.mk15
-rw-r--r--svtools/Executable_bmpsum.mk15
-rw-r--r--svtools/Executable_g2g.mk16
-rw-r--r--svtools/Library_hatchwindowfactory.mk16
-rw-r--r--svtools/Library_productregistration.mk17
-rw-r--r--svtools/Library_svt.mk12
-rw-r--r--svtools/source/filter.vcl/filter/FilterConfigItem.cxx2
-rw-r--r--toolkit/Library_tk.mk5
-rw-r--r--tools/Executable_mkunroll.mk9
-rw-r--r--tools/Executable_rscdep.mk8
-rw-r--r--tools/Executable_so_checksum.mk8
-rw-r--r--tools/Executable_sspretty.mk8
-rw-r--r--tools/Library_tl.mk10
18 files changed, 18 insertions, 163 deletions
diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk
index 37551b8b35e7..f077c1db4973 100644
--- a/comphelper/Library_comphelp.mk
+++ b/comphelper/Library_comphelp.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_linked_libs,comphelper,\
ucbhelper \
vos3 \
stl \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,comphelper,\
@@ -154,11 +154,4 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
comphelper/source/xml/ofopxmlhelper \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,comphelper,\
- dl \
- m \
- pthread \
-))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index 4a5c7ef4ce81..ef7d22c35081 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -53,7 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,sot,\
ucbhelper \
stl \
utl \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,sot,\
@@ -78,12 +78,4 @@ $(eval $(call gb_Library_add_exception_objects,sot,\
sot/source/sdstor/unostorageholder \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,sot,\
- dl \
- m \
- pthread \
-))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index b44eacf91f45..2950b3aa7dd3 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -50,14 +50,7 @@ $(eval $(call gb_Library_add_linked_libs,fsstorage,\
tl \
ucbhelper \
utl \
- $(gb_StdLibs) \
-))
-
-$(eval $(call gb_Library_add_linked_system_libs,fsstorage,\
- dl \
- icuuc \
- m \
- pthread \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,fsstorage,\
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index 50fc8be48012..e17004cff265 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
stl \
ucbhelper \
utl \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,passwordcontainer,\
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 67912fb1dc43..c406fc42b0cf 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -60,17 +60,9 @@ $(eval $(call gb_Library_add_linked_libs,svl,\
ucbhelper \
utl \
vos3 \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
-$(eval $(call gb_Library_add_linked_system_libs,svl,\
- dl \
- icuuc \
- m \
- pthread \
-))
-
-
$(eval $(call gb_Library_add_exception_objects,svl,\
svl/inc/pch/precompiled_svl \
svl/source/config/asiancfg \
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index 976dbc08d28b..ed63b5a66ad3 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Executable_add_linked_libs,bmp,\
tl \
vcl \
vos3 \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Executable_add_exception_objects,bmp,\
@@ -66,21 +67,7 @@ $(eval $(call gb_Executable_add_linked_libs,bmp,\
msvcrt \
user32 \
))
-else
-$(eval $(call gb_Executable_add_linked_libs,bmp,\
- kernel32 \
- msvcrt \
- oldnames \
- user32 \
- uwinapi \
-))
endif
endif
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,bmp,\
- dl \
- pthread \
-))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index f6117e8c0875..c89a8f1a0af3 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
tl \
vcl \
vos3 \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Executable_add_exception_objects,bmpsum,\
@@ -62,21 +63,7 @@ $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
msvcrt \
user32 \
))
-else
-$(eval $(call gb_Executable_add_linked_libs,bmpsum,\
- kernel32 \
- msvcrt \
- oldnames \
- user32 \
- uwinapi \
-))
endif
endif
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,bmpsum,\
- dl \
- pthread \
-))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index 744ab103041b..12cd79353f1c 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Executable_add_linked_libs,g2g,\
tl \
vcl \
vos3 \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Executable_add_exception_objects,g2g,\
@@ -63,21 +64,6 @@ $(eval $(call gb_Executable_add_linked_libs,g2g,\
msvcrt \
user32 \
))
-else
-$(eval $(call gb_Executable_add_linked_libs,g2g,\
- kernel32 \
- msvcrt \
- oldnames \
- user32 \
- uwinapi \
-))
-endif
endif
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,g2g,\
- pthread \
- dl \
- X11 \
-))
endif
# vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index 5917ae92b187..d8d3163dd2af 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
tk \
tl \
vcl \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\
@@ -56,13 +57,6 @@ $(eval $(call gb_Library_add_exception_objects,hatchwindowfactory,\
svtools/source/hatchwindow/ipwin \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
- dl \
- m \
- pthread \
-))
-endif
ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
@@ -78,14 +72,6 @@ $(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
user32 \
))
else
-$(eval $(call gb_Library_add_linked_libs,hatchwindowfactory,\
- kernel32 \
- msvcrt \
- oldnames \
- stl \
- user32 \
- uwinapi \
-))
endif
endif
# vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_productregistration.mk b/svtools/Library_productregistration.mk
index 61913bc8b7a6..09a9ed4e6990 100644
--- a/svtools/Library_productregistration.mk
+++ b/svtools/Library_productregistration.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_add_linked_libs,productregistration,\
tl \
utl \
vcl \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,productregistration,\
@@ -57,14 +58,6 @@ $(eval $(call gb_Library_add_exception_objects,productregistration,\
svtools/source/productregistration/registrationdlg \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,productregistration,\
- dl \
- m \
- pthread \
-))
-endif
-
ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,productregistration,\
@@ -79,14 +72,6 @@ $(eval $(call gb_Library_add_linked_libs,productregistration,\
msvcrt \
user32 \
))
-else
-$(eval $(call gb_Library_add_linked_libs,productregistration,\
- kernel32 \
- msvcrt \
- oldnames \
- user32 \
- uwinapi \
-))
endif
endif
# vim: set noet sw=4 ts=4:
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 48af2fba6395..02774c3482d0 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
utl \
vcl \
vos3 \
+ $(gb_STDLIBS) \
))
ifeq ($(SYSTEM_JPEG),YES)
@@ -290,14 +291,6 @@ $(eval $(call gb_Library_add_cobjects,svt,\
svtools/source/filter.vcl/jpeg/jpegc \
))
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,svt,\
- dl \
- m \
- pthread \
-))
-endif
-
ifeq ($(OS),WNT)
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,svt,\
@@ -321,14 +314,11 @@ else
$(eval $(call gb_Library_add_linked_libs,svt,\
advapi32 \
gdi32 \
- kernel32 \
- msvcrt \
oldnames \
ole32 \
oleaut32 \
user32 \
uuid \
- uwinapi \
))
endif
endif
diff --git a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
index 312f62af9d84..6cb4bbcb16d1 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
@@ -428,7 +428,7 @@ void FilterConfigItem::WriteBool( const OUString& rKey, sal_Bool bNewValue )
Any aAny;
if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) )
{
- sal_Bool bOldValue;
+ sal_Bool bOldValue = sal_False;
if ( aAny >>= bOldValue )
{
if ( bOldValue != bNewValue )
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 2ce5b1e8597c..d2a988928efb 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,tk,\
tl \
utl \
vcl \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Library_add_exception_objects,tk,\
@@ -159,9 +159,6 @@ endif
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_linked_libs,tk,\
X11 \
- dl \
- m \
- pthread \
))
endif
ifeq ($(OS),WNT)
diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index b904dbf16433..18a23bb9bcf5 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
stl \
tl \
vos3 \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial
@@ -79,11 +79,4 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
endif
endif
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
- dl \
- pthread \
-))
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index e0fd67efb03b..31a823a2a207 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_linked_libs,rscdep,\
stl \
tl \
vos3 \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
$(eval $(call gb_Executable_add_exception_objects,rscdep,\
@@ -83,10 +83,4 @@ $(eval $(call gb_Executable_add_linked_libs,rscdep,\
endif
endif
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,rscdep,\
- dl \
- pthread \
-))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index 952bb338aabc..491a2a958514 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Executable_set_cxxflags,so_checksum,\
$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
sal \
tl \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial
@@ -68,10 +68,4 @@ $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
endif
endif
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
- dl \
- pthread \
-))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk
index 64b7d6ef0cd4..c086cc5160a1 100644
--- a/tools/Executable_sspretty.mk
+++ b/tools/Executable_sspretty.mk
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_linked_libs,sspretty,\
stl \
tl \
vos3 \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial
@@ -77,10 +77,4 @@ $(eval $(call gb_Executable_add_linked_libs,sspretty,\
endif
endif
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_add_linked_libs,sspretty,\
- dl \
- pthread \
-))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 0cb59eaeac94..8489f21d7d47 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
cppu \
sal \
vos3 \
- $(gb_StdLibs) \
+ $(gb_STDLIBS) \
))
@@ -140,14 +140,6 @@ $(eval $(call gb_Library_add_linked_static_libs,tl,\
))
endif
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,tl,\
- dl \
- m \
- pthread \
-))
-endif
-
ifeq ($(OS),WNT)
$(eval $(call gb_Library_set_include,tl,\
$$(INCLUDE) \
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 11:41:34 +0000