summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Library_merged.mk12
-rw-r--r--RepositoryExternal.mk4
-rw-r--r--clucene/Library_clucene.mk8
-rw-r--r--padmin/Executable_spadmin.bin.mk4
-rw-r--r--padmin/Library_spa.mk6
-rw-r--r--sal/Library_sal.mk13
-rw-r--r--solenv/gbuild/platform/IOS_ARM_GCC.mk5
-rw-r--r--solenv/gbuild/platform/macosx.mk5
-rw-r--r--svx/Executable_gengal.bin.mk6
-rw-r--r--vcl/Library_desktop_detector.mk9
-rw-r--r--vcl/Library_vcl.mk12
-rw-r--r--vcl/Library_vclplug_gen.mk8
-rw-r--r--vcl/Library_vclplug_gtk.mk9
-rw-r--r--vcl/Library_vclplug_gtk3.mk9
-rw-r--r--vcl/Library_vclplug_kde.mk9
-rw-r--r--vcl/Library_vclplug_kde4.mk9
-rw-r--r--vcl/Library_vclplug_svp.mk9
-rw-r--r--vcl/Library_vclplug_tde.mk9
18 files changed, 74 insertions, 72 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index 847e5474e576..6a2a9ecbdbb9 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -99,10 +99,10 @@ $(eval $(call gb_Library_use_externals,merged,\
endif
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_libraries,merged,\
- dl \
- m \
- pthread \
+$(eval $(call gb_Library_add_libs,merged,\
+ -lm \
+ -ldl \
+ -lpthread \
))
endif
@@ -129,7 +129,9 @@ endif
ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_use_libraries,merged,\
AppleRemote \
- objc \
+))
+$(eval $(call gb_Library_add_libs,merged,\
+ -lobjc \
))
$(eval $(call gb_Library_use_system_darwin_frameworks,merged,\
Carbon \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 2f79d77ec35d..2da039709050 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1464,8 +1464,8 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
)
ifeq ($(OS),MACOSX)
-$(call gb_LinkTarget_use_libraries,$(1),\
- objc \
+$(call gb_LinkTarget_add_libs,$(1),\
+ -lobjc \
)
else ifeq ($(OS),WNT)
$(call gb_LinkTarget_use_libraries,$(1),\
diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index d80af92de302..77ac8ef48606 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -53,10 +53,10 @@ $(eval $(call gb_Library_add_defs,clucene,\
$(eval $(call gb_Library_add_standard_system_libs,clucene))
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_libraries,clucene,\
- dl \
- m \
- pthread \
+$(eval $(call gb_Library_add_libs,clucene,\
+ -lm \
+ -ldl \
+ -lpthread \
))
endif
diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk
index d699894b33fd..2450e9889a52 100644
--- a/padmin/Executable_spadmin.bin.mk
+++ b/padmin/Executable_spadmin.bin.mk
@@ -51,8 +51,8 @@ $(eval $(call gb_Executable_add_exception_objects,spadmin.bin,\
))
ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
-$(eval $(call gb_Executable_use_libraries,spadmin.bin,\
- pthread \
+$(eval $(call gb_Executable_add_libs,spadmin.bin,\
+ -lpthread \
))
endif
diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk
index 1db89d5f6ce8..42bb40dd7b48 100644
--- a/padmin/Library_spa.mk
+++ b/padmin/Library_spa.mk
@@ -53,9 +53,9 @@ $(eval $(call gb_Library_add_exception_objects,spa,\
))
ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
-$(eval $(call gb_Library_use_libraries,spa,\
- m \
- pthread \
+$(eval $(call gb_Library_add_libs,spa,\
+ -lm \
+ -lpthread \
))
endif
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index c42728ff9ac1..1d6f75431cca 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -57,11 +57,6 @@ $(eval $(call gb_Library_add_defs,sal,\
))
$(eval $(call gb_Library_use_libraries,sal,\
- $(if $(filter $(GUI),UNX), \
- $(if $(filter $(OS),ANDROID),, \
- pthread \
- ) \
- ) \
$(if $(filter $(OS),LINUX), \
dl \
) \
@@ -84,6 +79,14 @@ $(eval $(call gb_Library_use_libraries,sal,\
$(gb_UWINAPI) \
))
+$(eval $(call gb_Library_add_libs,sal,\
+ $(if $(filter $(GUI),UNX), \
+ $(if $(filter $(OS),ANDROID),, \
+ -lpthread \
+ ) \
+ ) \
+))
+
$(eval $(call gb_Library_add_standard_system_libs,sal))
ifeq ($(OS),MACOSX)
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index a36d6a36182d..21301fa95e84 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -205,11 +205,6 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-gb_Library_PLAINLIBS_NONE += \
- objc \
- m \
- pthread \
-
gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 17e7aab47ccb..f1b6666cc482 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -259,11 +259,6 @@ gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
-gb_Library_PLAINLIBS_NONE += \
- objc \
- m \
- pthread \
-
gb_Library_FILENAMES := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_OOOEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
index 696212b9d6c7..b679787d856f 100644
--- a/svx/Executable_gengal.bin.mk
+++ b/svx/Executable_gengal.bin.mk
@@ -81,9 +81,9 @@ $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
endif
ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
- dl \
- pthread \
+$(eval $(call gb_Executable_add_libs,$(svx_GENGALBIN),\
+ -ldl \
+ -lpthread \
))
endif
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index af8578988c34..a155c3e0d281 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -73,10 +73,11 @@ $(eval $(call gb_Library_add_exception_objects,desktop_detector,\
))
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_libraries,desktop_detector,\
- dl \
- m \
- pthread \
+$(eval $(call gb_Library_add_libs,desktop_detector,\
+ -lm \
+ -ldl \
+ -lpthread \
))
endif
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 194ef1c4bdd0..341439ab23fe 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -84,8 +84,8 @@ $(eval $(call gb_Library_use_libraries,vcl,\
$(eval $(call gb_Library_add_standard_system_libs,vcl))
ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_use_libraries,vcl,\
- objc \
+$(eval $(call gb_Library_add_libs,vcl,\
+ -lobjc \
))
endif
@@ -666,10 +666,10 @@ endif
endif
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_libraries,vcl,\
- dl \
- m \
- pthread \
+$(eval $(call gb_Library_add_libs,vcl,\
+ -lm \
+ -ldl \
+ -lpthread \
))
endif
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index d9a9d236944c..67a440b18e54 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -151,10 +151,10 @@ endif
endif # USE_XINERAMA
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_libraries,vclplug_gen,\
- dl \
- m \
- pthread \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
+ -lm \
+ -ldl \
+ -lpthread \
))
endif
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 2d3b46eaa686..42ea2a485495 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -111,10 +111,11 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
endif
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_libraries,vclplug_gtk,\
- dl \
- m \
- pthread \
+$(eval $(call gb_Library_add_libs,vclplug_gtk,\
+ -lm \
+ -ldl \
+ -lpthread \
))
endif
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 138904a0a004..b906fcf64bd5 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -115,10 +115,11 @@ $(eval $(call gb_Library_use_static_libraries,vclplug_gtk3,\
))
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
- dl \
- m \
- pthread \
+$(eval $(call gb_Library_add_libs,vclplug_gtk3,\
+ -lm \
+ -ldl \
+ -lpthread \
))
endif
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 7aa5ee5e230b..bfcf782345b4 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -83,10 +83,11 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
$(eval $(call gb_Library_set_warnings_not_errors,vclplug_kde))
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_libraries,vclplug_kde,\
- dl \
- m \
- pthread \
+$(eval $(call gb_Library_add_libs,vclplug_kde,\
+ -lm \
+ -ldl \
+ -lpthread \
))
endif
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 3fbb80319a80..9fd110fc506b 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -83,10 +83,11 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
))
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_libraries,vclplug_kde4,\
- dl \
- m \
- pthread \
+$(eval $(call gb_Library_add_libs,vclplug_kde4,\
+ -lm \
+ -ldl \
+ -lpthread \
))
endif
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 63c9d725af73..750342c3225b 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -78,10 +78,11 @@ $(eval $(call gb_Library_use_static_libraries,vclplug_svp,\
))
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_libraries,vclplug_svp,\
- dl \
- m \
- pthread \
+$(eval $(call gb_Library_add_libs,vclplug_svp,\
+ -lm \
+ -ldl \
+ -lpthread \
))
endif
+
# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
index 5e61c6315d7a..a55b8dd8025a 100644
--- a/vcl/Library_vclplug_tde.mk
+++ b/vcl/Library_vclplug_tde.mk
@@ -92,10 +92,11 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_tde,\
$(eval $(call gb_Library_set_warnings_not_errors,vclplug_tde))
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_libraries,vclplug_tde,\
- dl \
- m \
- pthread \
+$(eval $(call gb_Library_add_libs,vclplug_tde,\
+ -lm \
+ -ldl \
+ -lpthread \
))
endif
+
# vim: set noet sw=4 ts=4:
generated by cgit (git 2.34.1) at 2024-07-02 18:00:39 +0000