gbuild: gb_Library_PLAINLIBS_NONE cleanup for Mac

Change-Id: I66f8229e186e312ed3242695db9ef0768ab4d9a0

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 \

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

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
 

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
 

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
 

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)

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

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

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
 

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:

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
 

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
 

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:

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:

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:

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:

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:

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: