gbuild: gb_Library_PLAINLIBS_NONE cleanup for unxgcc/solaris

Change-Id: Ia7f64bdd0fd81c5dcc08d828db4602b65e2da949

7 files changed, 49 insertions, 28 deletions

diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index a155c3e0d281..6ade59bbd86a 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/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 \
 ))
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 67a440b18e54..67795ef553a9 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/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 \
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 42ea2a485495..3fb0d8038b69 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/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 \
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index b906fcf64bd5..f924e80d8c33 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/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 \
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index bfcf782345b4..d61717c00e2c 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/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 \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 9fd110fc506b..f8450203ccd2 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/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 \
diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
index a55b8dd8025a..efd3daaff151 100644
--- a/vcl/Library_vclplug_tde.mk
+++ b/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 \