DBus Menu

Merge lp:~ted/libdbusmenu/grrr-use-right-interfaces into lp:libdbusmenu/0.5

  1. grrr-use-right-interfaces
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: 244
Proposed branch: lp:~ted/libdbusmenu/grrr-use-right-interfaces
Merge into: lp:libdbusmenu/0.5
Diff against target: 36 lines (+12/-5)
1 file modified
libdbusmenu-glib/Makefile.am (+12/-5)
To merge this branch: bzr merge lp:~ted/libdbusmenu/grrr-use-right-interfaces
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Review via email: mp+51431@code.launchpad.net

Description of the change

Fixing the gir scanner so it only provides the interfaces we're actually exporting.

To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

Looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-glib/Makefile.am'
2--- libdbusmenu-glib/Makefile.am 2011-02-24 14:31:26 +0000
3+++ libdbusmenu-glib/Makefile.am 2011-02-26 20:07:32 +0000
4@@ -17,12 +17,17 @@
5
6 libdbusmenu_glibincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-glib/
7
8+
9+EXPORTED_OBJECTS = \
10+ enum-types.h \
11+ menuitem.h \
12+ menuitem-proxy.h \
13+ server.h \
14+ client.h
15+
16 libdbusmenu_glibinclude_HEADERS = \
17+ $(EXPORTED_OBJECTS) \
18 dbusmenu-glib.h \
19- menuitem.h \
20- menuitem-proxy.h \
21- server.h \
22- client.h \
23 types.h
24
25 libdbusmenu_glib_la_SOURCES = \
26@@ -153,7 +158,9 @@
27
28 if HAVE_INTROSPECTION
29
30-introspection_sources = $(libdbusmenu_glibinclude_HEADERS) $(libdbusmenu_glib_la_SOURCES)
31+introspection_sources = \
32+ $(libdbusmenu_glibinclude_HEADERS) \
33+ $(EXPORTED_OBJECTS:.h=.c)
34
35 Dbusmenu-0.4.gir: libdbusmenu-glib.la
36 Dbusmenu_0_4_gir_INCLUDES = \

Subscribers

People subscribed via source and target branches