summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--comphelper/Library_comphelp.mk16
-rw-r--r--sot/Library_sot.mk8
-rw-r--r--svl/Library_fsstorage.mk9
-rw-r--r--svl/Library_passwordcontainer.mk19
-rw-r--r--svl/Library_svl.mk7
-rw-r--r--toolkit/Library_tk.mk7
-rw-r--r--tools/Executable_mkunroll.mk5
-rw-r--r--tools/Executable_rscdep.mk7
-rw-r--r--tools/Executable_so_checksum.mk9
-rw-r--r--tools/Executable_sspretty.mk5
-rw-r--r--tools/Library_tl.mk8
11 files changed, 17 insertions, 83 deletions
diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk
index 841b0522a38f..37551b8b35e7 100644
--- a/comphelper/Library_comphelp.mk
+++ b/comphelper/Library_comphelp.mk
@@ -46,12 +46,13 @@ $(eval $(call gb_Library_set_defs,comphelper,\
))
$(eval $(call gb_Library_add_linked_libs,comphelper,\
- sal \
- cppuhelper \
+ sal \
+ cppuhelper \
cppu \
- ucbhelper \
+ ucbhelper \
vos3 \
stl \
+ $(gb_StdLibs) \
))
$(eval $(call gb_Library_add_exception_objects,comphelper,\
@@ -119,7 +120,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
comphelper/source/misc/uieventslogger \
comphelper/source/misc/weak \
comphelper/source/misc/weakeventlistener \
- comphelper/source/officeinstdir/officeinstallationdirectories \
+ comphelper/source/officeinstdir/officeinstallationdirectories \
comphelper/source/processfactory/componentfactory \
comphelper/source/processfactory/processfactory \
comphelper/source/property/ChainablePropertySet \
@@ -160,11 +161,4 @@ $(eval $(call gb_Library_add_linked_libs,comphelper,\
pthread \
))
endif
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,comphelper,\
- kernel32 \
- msvcrt \
- uwinapi \
-))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index 5201312e05e1..4a5c7ef4ce81 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Library_add_linked_libs,sot,\
ucbhelper \
stl \
utl \
+ $(gb_StdLibs) \
))
$(eval $(call gb_Library_add_exception_objects,sot,\
@@ -85,11 +86,4 @@ $(eval $(call gb_Library_add_linked_libs,sot,\
))
endif
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,sot,\
- kernel32 \
- msvcrt \
- uwinapi \
-))
-endif
# vim: set noet sw=4 ts=4:
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index 4293ced781f2..b44eacf91f45 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_add_linked_libs,fsstorage,\
tl \
ucbhelper \
utl \
+ $(gb_StdLibs) \
))
$(eval $(call gb_Library_add_linked_system_libs,fsstorage,\
@@ -80,14 +81,6 @@ $(eval $(call gb_Library_add_linked_libs,fsstorage,\
msvcrt \
user32 \
))
-else
-$(eval $(call gb_Library_add_linked_libs,fsstorage,\
- kernel32 \
- msvcrt \
- oldnames \
- user32 \
- uwinapi \
-))
endif
endif
# vim: set noet sw=4 ts=4:
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index 654f394f6176..50fc8be48012 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -48,13 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
stl \
ucbhelper \
utl \
-))
-
-$(eval $(call gb_Library_add_linked_system_libs,passwordcontainer,\
- icuuc \
- dl \
- m \
- pthread \
+ $(gb_StdLibs) \
))
$(eval $(call gb_Library_add_exception_objects,passwordcontainer,\
@@ -70,20 +64,11 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
mingw32 \
$(gb_MINGW_LIBGCC) \
uwinapi \
- moldname \
mingwex \
kernel32 \
msvcrt \
- user32 \
-))
-else
-$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\
- kernel32 \
- msvcrt \
- oldnames \
- user32 \
- uwinapi \
))
endif
endif
+
# vim: set noet sw=4 ts=4:
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index 605280eefe16..67912fb1dc43 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -60,6 +60,7 @@ $(eval $(call gb_Library_add_linked_libs,svl,\
ucbhelper \
utl \
vos3 \
+ $(gb_StdLibs) \
))
$(eval $(call gb_Library_add_linked_system_libs,svl,\
@@ -182,13 +183,7 @@ $(eval $(call gb_Library_add_linked_libs,svl,\
))
else
$(eval $(call gb_Library_add_linked_libs,svl,\
- advapi32 \
- kernel32 \
- gdi32 \
- msvcrt \
- shell32 \
user32 \
- uwinapi \
))
endif
else
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index abf06ac8fa35..2ce5b1e8597c 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,tk,\
tl \
utl \
vcl \
+ $(gb_StdLibs) \
))
$(eval $(call gb_Library_add_exception_objects,tk,\
@@ -175,12 +176,6 @@ $(eval $(call gb_Library_add_linked_libs,tk,\
kernel32 \
msvcrt \
))
-else
-$(eval $(call gb_Library_add_linked_libs,tk,\
- kernel32 \
- msvcrt \
- uwinapi \
-))
endif
endif
# vim: set noet sw=4 ts=4:
diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index 5f9753a2a88f..b904dbf16433 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -45,6 +45,7 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
stl \
tl \
vos3 \
+ $(gb_StdLibs) \
))
# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial
@@ -73,11 +74,7 @@ $(eval $(call gb_Executable_add_linked_libs,mkunroll,\
))
else
$(eval $(call gb_Executable_add_linked_libs,mkunroll,\
- kernel32 \
- msvcrt \
oldnames \
- user32 \
- uwinapi \
))
endif
endif
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 85551407d335..e0fd67efb03b 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Executable_add_linked_libs,rscdep,\
stl \
tl \
vos3 \
+ $(gb_StdLibs) \
))
$(eval $(call gb_Executable_add_exception_objects,rscdep,\
@@ -77,13 +78,7 @@ $(eval $(call gb_Executable_add_linked_libs,rscdep,\
else
$(eval $(call gb_Executable_add_linked_libs,rscdep,\
gnu_getopt \
-))
-$(eval $(call gb_Executable_add_linked_libs,rscdep,\
- kernel32 \
- msvcrt \
oldnames \
- user32 \
- uwinapi \
))
endif
endif
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index 1c0faf30b015..952bb338aabc 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Executable_set_cxxflags,so_checksum,\
$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
sal \
tl \
+ $(gb_StdLibs) \
))
# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 vos3gcc3 - seems to be superficial
@@ -64,14 +65,6 @@ $(eval $(call gb_Executable_add_linked_libs,so_checksum,\
msvcrt \
user32 \
))
-else
-$(eval $(call gb_Executable_add_linked_libs,so_checksum,\
- kernel32 \
- msvcrt \
- oldnames \
- user32 \
- uwinapi \
-))
endif
endif
diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk
index 637acf2afd0e..64b7d6ef0cd4 100644
--- a/tools/Executable_sspretty.mk
+++ b/tools/Executable_sspretty.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Executable_add_linked_libs,sspretty,\
stl \
tl \
vos3 \
+ $(gb_StdLibs) \
))
# used to link against basegfxlx comphelp4gcc3 i18nisolang1gcc3 ucbhelper4gcc3 uno_cppu uno_cppuhelpergcc3 uno_salhelpergcc3 - seems to be superficial
@@ -71,11 +72,7 @@ $(eval $(call gb_Executable_add_linked_libs,sspretty,\
))
else
$(eval $(call gb_Executable_add_linked_libs,sspretty,\
- kernel32 \
- msvcrt \
oldnames \
- user32 \
- uwinapi \
))
endif
endif
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index a4f57ed2d239..0cb59eaeac94 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
cppu \
sal \
vos3 \
+ $(gb_StdLibs) \
))
@@ -159,14 +160,13 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
ifneq ($(USE_MINGW),)
$(eval $(call gb_Library_add_linked_libs,tl,\
+ uwinapi \
mingwthrd \
$(gb_MINGW_LIBSTDCPP) \
mingw32 \
$(gb_MINGW_LIBGCC) \
- uwinapi \
moldname \
mingwex \
- advapi32 \
kernel32 \
mpr \
msvcrt \
@@ -177,16 +177,12 @@ $(eval $(call gb_Library_add_linked_libs,tl,\
))
else
$(eval $(call gb_Library_add_linked_libs,tl,\
- advapi32 \
- kernel32 \
mpr \
- msvcrt \
oldnames \
ole32 \
shell32 \
user32 \
uuid \
- uwinapi \
))
endif
endif
generated by cgit (git 2.34.1) at 2024-06-20 21:54:29 +0000