gbuild: gb_Library_PLAINLIBS_NONE cleanup for unxgcc/solaris

Change-Id: Ia7f64bdd0fd81c5dcc08d828db4602b65e2da949

RepositoryExternal.mk

@@ -914,9 +914,9 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 	ssl \
 )
 ifeq ($(OS),SOLARIS)
-$(call gb_LinkTarget_use_libraries,$(1),\
-	nsl \
-	socket \
+$(call gb_LinkTarget_add_libs,$(1),\
+	-lnsl \
+	-lsocket \
 )
 endif
 endif

bridges/Library_gcc3_aix_powerpc.mk

@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 

bridges/Library_gcc3_ios_arm.mk

@@ -40,9 +40,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 

bridges/Library_gcc3_linux_alpha.mk

@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 

bridges/Library_gcc3_linux_arm.mk

@@ -36,11 +36,14 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+ifneq ($(OS),ANDROID)
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+endif
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	$(if $(filter-out ANDROID,$(OS)),\
-		dl \
-	) \
 	sal \
 ))
 

bridges/Library_gcc3_linux_hppa.mk

@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 

bridges/Library_gcc3_linux_ia64.mk

@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 

bridges/Library_gcc3_linux_intel.mk

@@ -39,11 +39,14 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	) \
 ))
 
+ifneq ($(OS),ANDROID)
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+endif
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	$(if $(filter-out ANDROID,$(OS)),\
-		dl \
-	) \
 	sal \
 ))
 

bridges/Library_gcc3_linux_m68k.mk

@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 

bridges/Library_gcc3_linux_mips.mk

@@ -36,11 +36,14 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+ifneq ($(OS),ANDROID)
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+endif
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	$(if $(filter-out ANDROID,$(OS)),\
-		dl \
-	) \
 	sal \
 ))
 

bridges/Library_gcc3_linux_powerpc.mk

@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 

bridges/Library_gcc3_linux_powerpc64.mk

@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 

bridges/Library_gcc3_linux_s390.mk

@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 

bridges/Library_gcc3_linux_s390x.mk

@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 

bridges/Library_gcc3_linux_sparc.mk

@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 

bridges/Library_gcc3_linux_x86-64.mk

@@ -41,9 +41,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	) \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 

bridges/Library_gcc3_solaris_intel.mk

@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 

bridges/Library_gcc3_solaris_sparc.mk

@@ -36,9 +36,12 @@ $(eval $(call gb_Library_add_cxxflags,gcc3_uno,\
 	-fno-strict-aliasing \
 ))
 
+$(eval $(call gb_Library_add_libs,gcc3_uno,\
+	-ldl \
+))
+
 $(eval $(call gb_Library_use_libraries,gcc3_uno,\
 	cppu \
-	dl \
 	sal \
 ))
 

canvas/Library_cairocanvas.mk

@@ -116,8 +116,8 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
 ))
 
 # freetype? fontconfig? -> test on Solaris
-$(eval $(call gb_Library_use_libraries,cairocanvas,\
-	X11 \
+$(eval $(call gb_Library_add_libs,cairocanvas,\
+	-lX11 \
 ))
 $(eval $(call gb_Library_use_externals,cairocanvas,\
 	Xrender \

extensions/Executable_nsplugin.mk

@@ -42,19 +42,22 @@ $(eval $(call gb_Executable_use_static_libraries,nsplugin,\
 	npsoenv \
 ))
 
-$(eval $(call gb_Executable_use_libraries,nsplugin,\
-	cppu \
-	cppuhelper \
-	sal \
+$(eval $(call gb_Executable_add_libs,nsplugin,\
 	$(if $(filter $(OS),LINUX), \
-		dl \
+		-ldl \
 	) \
 	$(if $(filter $(OS),SOLARIS), \
-		nsl \
-		socket \
+		-lnsl \
+		-lsocket \
 	) \
 ))
 
+$(eval $(call gb_Executable_use_libraries,nsplugin,\
+	cppu \
+	cppuhelper \
+	sal \
+))
+
 ifeq ($(GUI),WNT)
 $(eval $(call gb_Executable_add_exception_objects,nsplugin,\
 	extensions/source/nsplugin/source/nsp_windows \

extensions/Library_scn.mk

@@ -69,8 +69,8 @@ $(eval $(call gb_Library_add_exception_objects,scn,\
 	extensions/source/scanner/scanunx \
 ))
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_libraries,scn,\
-	dl \
+$(eval $(call gb_Library_add_libs,scn,\
+	-ldl \
 ))
 endif
 endif

framework/Library_lomenubar.mk

@@ -43,7 +43,10 @@ $(eval $(call gb_Library_use_libraries,lomenubar,\
 	cppu \
 	cppuhelper \
     comphelper \
-	X11 \
+))
+
+$(eval $(call gb_Library_add_libs,lomenubar,\
+	-lX11 \
 ))
 
 $(eval $(call gb_Library_add_standard_system_libs,lomenubar))

neon/Library_neon.mk

@@ -69,8 +69,8 @@ $(eval $(call gb_Library_add_generated_cobjects,neon,\
 endif
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_libraries,neon,\
-	dl \
+$(eval $(call gb_Library_add_libs,neon,\
+	-ldl \
 ))
 endif
 

padmin/Executable_spadmin.bin.mk

@@ -57,8 +57,8 @@ $(eval $(call gb_Executable_add_libs,spadmin.bin,\
 endif
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_use_libraries,spadmin.bin,\
-    dl \
+$(eval $(call gb_Executable_add_libs,spadmin.bin,\
+    -ldl \
 ))
 endif
 

padmin/Library_spa.mk

@@ -60,8 +60,8 @@ $(eval $(call gb_Library_add_libs,spa,\
 endif
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_use_libraries,spa,\
-    dl \
+$(eval $(call gb_Library_add_libs,spa,\
+    -ldl \
 ))
 endif
 

pyuno/Library_pyuno_wrapper.mk

@@ -51,8 +51,8 @@ endif
 ifneq ($(GUI)$(COM),WNTMSC)
 ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
 
-$(eval $(call gb_Library_use_libraries,pyuno_wrapper,\
-	dl \
+$(eval $(call gb_Library_add_libs,pyuno_wrapper,\
+	-ldl \
 ))
 
 endif

sal/Library_sal.mk

@@ -57,13 +57,6 @@ $(eval $(call gb_Library_add_defs,sal,\
 ))
 
 $(eval $(call gb_Library_use_libraries,sal,\
-	$(if $(filter $(OS),LINUX), \
-		dl \
-	) \
-	$(if $(filter $(OS),SOLARIS), \
-		nsl \
-		socket \
-	) \
 	$(if $(filter $(OS),WNT), \
 		advapi32 \
 		comdlg32 \
@@ -85,6 +78,13 @@ $(eval $(call gb_Library_add_libs,sal,\
 			-lpthread \
 		) \
 	) \
+	$(if $(filter $(OS),LINUX), \
+		-ldl \
+	) \
+	$(if $(filter $(OS),SOLARIS), \
+		-lnsl \
+		-lsocket \
+	) \
 ))
 
 $(eval $(call gb_Library_add_standard_system_libs,sal))

shell/Executable_gnome_open_url.mk

@@ -28,8 +28,8 @@
 $(eval $(call gb_Executable_Executable,gnome-open-url.bin))
 
 ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),)
-$(eval $(call gb_Executable_use_libraries,gnome-open-url.bin,\
-	dl \
+$(eval $(call gb_Executable_add_libs,gnome-open-url.bin,\
+	-ldl \
 ))
 endif
 

slideshow/Library_OGLTrans.mk

@@ -100,10 +100,10 @@ $(eval $(call gb_Library_add_exception_objects,OGLTrans,\
     slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl \
 ))
 
-$(eval $(call gb_Library_use_libraries,OGLTrans,\
-    GL \
-    GLU \
-    X11 \
+$(eval $(call gb_Library_add_libs,OGLTrans,\
+	-lGL \
+	-lGLU \
+	-lX11 \
 ))
 endif
 

solenv/gbuild/platform/solaris.mk

@@ -241,20 +241,6 @@ gb_STDLIBS := \
 	-lnsl \
 	-lsocket \
 
-gb_Library_PLAINLIBS_NONE += \
-	dl \
-	GL \
-	GLU \
-	ICE \
-	m \
-	nsl \
-	pthread \
-	socket \
-	SM \
-	ICE \
-	X11 \
-	Xext \
-
 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/unxgcc.mk

@@ -239,18 +239,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 += \
-	dl \
-	GL \
-	GLU \
-	ICE \
-	m \
-	pthread \
-	SM \
-	ICE \
-	X11 \
-	Xext \
-
 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)) \

toolkit/Library_tk.mk

@@ -142,8 +142,8 @@ endif
 
 ifneq ($(GUIBASE),headless)
 ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
-$(eval $(call gb_Library_use_libraries,tk,\
-    X11 \
+$(eval $(call gb_Library_add_libs,tk,\
+    -lX11 \
 ))
 endif
 endif

ucb/Library_ucpdav1.mk

@@ -80,10 +80,10 @@ $(eval $(call gb_Library_use_libraries,ucpdav1,\
 endif
 
 ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Library_use_libraries,ucpdav1,\
-	dl \
-	nsl \
-	socket \
+$(eval $(call gb_Library_add_libs,ucpdav1,\
+	-ldl \
+	-lnsl \
+	-lsocket \
 ))
 endif
 

vcl/Library_desktop_detector.mk

@@ -55,10 +55,6 @@ $(eval $(call gb_Library_use_libraries,desktop_detector,\
     jvmaccess \
     cppu \
     sal \
-    X11 \
-    Xext \
-    SM \
-    ICE \
 ))
 
 $(eval $(call gb_Library_add_standard_system_libs,desktop_detector))
@@ -68,6 +64,13 @@ $(eval $(call gb_Library_use_externals,desktop_detector,\
 	icuuc \
 ))
 
+$(eval $(call gb_Library_add_libs,desktop_detector,\
+	-lX11 \
+	-lXext \
+	-lSM \
+	-lICE \
+))
+
 $(eval $(call gb_Library_add_exception_objects,desktop_detector,\
     vcl/unx/generic/desktopdetect/desktopdetector \
 ))

vcl/Library_vclplug_gen.mk

@@ -49,10 +49,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\
     jvmaccess \
     cppu \
     sal \
-    X11 \
-    Xext \
-    SM \
-    ICE \
 ))
 
 $(eval $(call gb_Library_add_standard_system_libs,vclplug_gen))
@@ -64,6 +60,13 @@ $(eval $(call gb_Library_use_externals,vclplug_gen,\
 	Xrender \
 ))
 
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
+	-lX11 \
+	-lXext \
+	-lSM \
+	-lICE \
+))
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
     vcl/unx/generic/app/i18n_cb \
     vcl/unx/generic/app/i18n_ic \

vcl/Library_vclplug_gtk.mk

@@ -57,10 +57,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\
     jvmaccess \
     cppu \
     sal \
-    X11 \
-    Xext \
-    SM \
-    ICE \
 ))
 
 $(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk))
@@ -73,6 +69,13 @@ $(eval $(call gb_Library_use_externals,vclplug_gtk,\
 	icuuc \
 ))
 
+$(eval $(call gb_Library_add_libs,vclplug_gtk,\
+	-lX11 \
+	-lXext \
+	-lSM \
+	-lICE \
+))
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
     vcl/unx/gtk/a11y/atkaction \
     vcl/unx/gtk/a11y/atkbridge \

vcl/Library_vclplug_gtk3.mk

@@ -69,10 +69,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
     jvmaccess \
     cppu \
     sal \
-    X11 \
-    Xext \
-    SM \
-    ICE \
 ))
 
 $(eval $(call gb_Library_add_standard_system_libs,vclplug_gtk3))
@@ -81,6 +77,13 @@ $(eval $(call gb_Library_use_externals,vclplug_gtk3,\
 	dbus \
 ))
 
+$(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
+	-lX11 \
+	-lXext \
+	-lSM \
+	-lICE \
+))
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_gtk3,\
     vcl/unx/gtk3/a11y/gtk3atkaction \
     vcl/unx/gtk3/a11y/gtk3atkbridge \

vcl/Library_vclplug_kde.mk

@@ -58,10 +58,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\
     jvmaccess \
     cppu \
     sal \
-    X11 \
-    Xext \
-    SM \
-    ICE \
 ))
 
 $(eval $(call gb_Library_add_standard_system_libs,vclplug_kde))
@@ -72,6 +68,13 @@ $(eval $(call gb_Library_use_externals,vclplug_kde,\
 	kde \
 ))
 
+$(eval $(call gb_Library_add_libs,vclplug_kde,\
+	-lX11 \
+	-lXext \
+	-lSM \
+	-lICE \
+))
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
     vcl/unx/kde/kdedata \
     vcl/unx/kde/salnativewidgets-kde \

vcl/Library_vclplug_kde4.mk

@@ -56,10 +56,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\
     jvmaccess \
     cppu \
     sal \
-    X11 \
-    Xext \
-    SM \
-    ICE \
 ))
 
 $(eval $(call gb_Library_add_standard_system_libs,vclplug_kde4))
@@ -70,6 +66,13 @@ $(eval $(call gb_Library_use_externals,vclplug_kde4,\
 	kde4 \
 ))
 
+$(eval $(call gb_Library_add_libs,vclplug_kde4,\
+	-lX11 \
+	-lXext \
+	-lSM \
+	-lICE \
+))
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
     vcl/unx/kde4/KDEData \
 	vcl/unx/kde4/KDE4FilePicker \

vcl/Library_vclplug_tde.mk

@@ -63,10 +63,6 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\
     jvmaccess \
     cppu \
     sal \
-    X11 \
-    Xext \
-    SM \
-    ICE \
 ))
 
 $(eval $(call gb_Library_add_standard_system_libs,vclplug_tde))
@@ -76,6 +72,13 @@ $(eval $(call gb_Library_use_externals,vclplug_tde,\
 	icuuc \
 ))
 
+$(eval $(call gb_Library_add_libs,vclplug_tde,\
+	-lX11 \
+	-lXext \
+	-lSM \
+	-lICE \
+))
+
 $(eval $(call gb_Library_add_exception_objects,vclplug_tde,\
     vcl/unx/kde/kdedata \
     vcl/unx/kde/salnativewidgets-kde \

xmlsecurity/Library_xsec_xmlsec.mk

@@ -181,8 +181,8 @@ $(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
 endif # ifeq ($(SYSTEM_NSS),YES)
 
 ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Library_use_libraries,xsec_xmlsec,\
-	dl \
+$(eval $(call gb_Library_add_libs,xsec_xmlsec,\
+	-ldl \
 ))
 endif