You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/01/12 22:12:28 UTC

svn commit: r1230786 - /incubator/ooo/trunk/main/vcl/Library_vclplug_gtk.mk

Author: arielch
Date: Thu Jan 12 21:12:27 2012
New Revision: 1230786

URL: http://svn.apache.org/viewvc?rev=1230786&view=rev
Log:
Fix gb_Library_add_external_libs when ENABLE_DBUS

ToDo: pkg-config should be called in configure and set DBUS_CFLAGS and
DBUS_LIBS properly.

Modified:
    incubator/ooo/trunk/main/vcl/Library_vclplug_gtk.mk

Modified: incubator/ooo/trunk/main/vcl/Library_vclplug_gtk.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/Library_vclplug_gtk.mk?rev=1230786&r1=1230785&r2=1230786&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/Library_vclplug_gtk.mk (original)
+++ incubator/ooo/trunk/main/vcl/Library_vclplug_gtk.mk Thu Jan 12 21:12:27 2012
@@ -54,10 +54,11 @@ $(eval $(call gb_Library_set_defs,vclplu
     -DENABLE_DBUS \
 ))
 $(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
-    $$(LDFLAGS) \
+	$$(LDFLAGS) \
+	$(filter-out -l%,$(shell pkg-config --libs dbus-glib-1)) \
 ))
-$(eval $(call gb_Library_add_external_libs,vclplug_gtk,	\
-    $(shell pkg-config --libs dbus-glib-1)		\
+$(eval $(call gb_Library_add_external_libs,vclplug_gtk, \
+	$(patsubst -l%,%, $(filter -l%, $(shell pkg-config --libs dbus-glib-1))) \
 ))
 endif