← Back to team overview

ayatana-commits team mailing list archive

[Merge] lp:~ted/dbusmenu/grrr-use-right-interfaces into lp:dbusmenu

 

Ted Gould has proposed merging lp:~ted/dbusmenu/grrr-use-right-interfaces into lp:dbusmenu.

Requested reviews:
  DBus Menu Team (dbusmenu-team)

For more details, see:
https://code.launchpad.net/~ted/dbusmenu/grrr-use-right-interfaces/+merge/51431

Fixing the gir scanner so it only provides the interfaces we're actually exporting.
-- 
https://code.launchpad.net/~ted/dbusmenu/grrr-use-right-interfaces/+merge/51431
Your team ayatana-commits is subscribed to branch lp:dbusmenu.
=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am	2011-02-24 14:31:26 +0000
+++ libdbusmenu-glib/Makefile.am	2011-02-26 20:07:32 +0000
@@ -17,12 +17,17 @@
 
 libdbusmenu_glibincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-glib/
 
+
+EXPORTED_OBJECTS = \
+	enum-types.h \
+	menuitem.h \
+	menuitem-proxy.h \
+	server.h \
+	client.h
+
 libdbusmenu_glibinclude_HEADERS = \
+	$(EXPORTED_OBJECTS) \
 	dbusmenu-glib.h \
-	menuitem.h \
-	menuitem-proxy.h \
-	server.h \
-	client.h \
 	types.h
 
 libdbusmenu_glib_la_SOURCES = \
@@ -153,7 +158,9 @@
 
 if HAVE_INTROSPECTION
 
-introspection_sources = $(libdbusmenu_glibinclude_HEADERS) $(libdbusmenu_glib_la_SOURCES)
+introspection_sources = \
+	$(libdbusmenu_glibinclude_HEADERS) \
+	$(EXPORTED_OBJECTS:.h=.c)
 
 Dbusmenu-0.4.gir: libdbusmenu-glib.la
 Dbusmenu_0_4_gir_INCLUDES = \


Follow ups