From bce530e89cd32d40f7a54f80906c321c5b1b944b Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 28 Sep 2012 21:37:26 +0200 Subject: vcl: fix gtk3 build breakage due to forgotten use_libraries Change-Id: I53faf1a5c88b6ffd954fd98814cdf27b77f1c3db --- vcl/Library_vclplug_gtk3.mk | 15 ++++++--------- vcl/Library_vclplug_tde.mk | 13 +++++-------- 2 files changed, 11 insertions(+), 17 deletions(-) (limited to 'vcl') diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk index 2c34e1d529e7..a04472353db2 100644 --- a/vcl/Library_vclplug_gtk3.mk +++ b/vcl/Library_vclplug_gtk3.mk @@ -50,8 +50,12 @@ $(eval $(call gb_Library_add_defs,vclplug_gtk3,\ $(eval $(call gb_Library_use_sdk_api,vclplug_gtk3)) $(eval $(call gb_Library_add_libs,vclplug_gtk3,\ - $$(GTK3_LIBS) \ - $$(GTHREAD_LIBS) \ + $(GTK3_LIBS) \ + $(GTHREAD_LIBS) \ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ )) $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\ @@ -75,13 +79,6 @@ $(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_tde.mk b/vcl/Library_vclplug_tde.mk index 9431131171ce..600f00a9aa35 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -45,7 +45,11 @@ $(eval $(call gb_Library_add_defs,vclplug_tde,\ $(eval $(call gb_Library_use_sdk_api,vclplug_tde)) $(eval $(call gb_Library_add_libs,vclplug_tde,\ - $$(TDE_LIBS) \ + $(TDE_LIBS) \ + -lX11 \ + -lXext \ + -lSM \ + -lICE \ )) $(eval $(call gb_Library_use_libraries,vclplug_tde,\ @@ -70,13 +74,6 @@ $(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 \ -- cgit