[Libreoffice-commits] .: framework/Library_lomenubar.mk

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Tue Jul 26 07:06:31 PDT 2011


 framework/Library_lomenubar.mk |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 4ff0b8ba78299cb8f5582794bd99c7f603ffa56b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Jul 26 16:05:12 2011 +0200

    use dbusmenugtk external

diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk
index dd3848e..4ff5fb3 100644
--- a/framework/Library_lomenubar.mk
+++ b/framework/Library_lomenubar.mk
@@ -29,22 +29,15 @@ $(eval $(call gb_Library_Library,lomenubar))
 
 $(eval $(call gb_Library_set_componentfile,lomenubar,framework/util/lomenubar))
 
-# FIXME pkg-config call belong in ./configure obviously
-
-$(eval $(call gb_Library_set_include,lomenubar,\
-	$$(INCLUDE) \
-	$(shell pkg-config --cflags-only-I dbusmenu-gtk-0.4) \
-))
 
 $(eval $(call gb_Library_add_api,lomenubar,\
     offapi \
     udkapi \
 ))
 
-$(eval $(call gb_Library_set_ldflags,lomenubar,\
-	$$(LDFLAGS) \
-	$(shell pkg-config --libs dbusmenu-gtk-0.4) \
-	$(GTK_LIBS) \
+$(eval $(call gb_Library_use_externals,lomenubar,\
+	gtk \
+	dbusmenugtk \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,lomenubar,\


More information about the Libreoffice-commits mailing list