DBus Menu

Merge lp:~charlesk/libdbusmenu/gcov into lp:libdbusmenu/12.10

  1. gcov
  2. Merge into trunk.12.10
Proposed by Charles Kerr
Status: Merged
Approved by: Allan LeSage
Approved revision: 418
Merged at revision: 429
Proposed branch: lp:~charlesk/libdbusmenu/gcov
Merge into: lp:libdbusmenu/12.10
Diff against target: 29 lines (+0/-6)
2 files modified
libdbusmenu-glib/Makefile.am (+0/-3)
libdbusmenu-gtk/Makefile.am (+0/-3)
To merge this branch: bzr merge lp:~charlesk/libdbusmenu/gcov
Reviewer Review Type Date Requested Status
Allan LeSage (community) Approve
Review via email: mp+104480@code.launchpad.net

Description of the change

Fix a bug introduced in r399 that breaks the build when g-ir-scanner is reached iff configure is run with --enable-gcov

To post a comment you must log in.
Revision history for this message
Allan LeSage (allanlesage) wrote :

Confirmed that we're able to get coverage data.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am 2012-04-11 22:40:03 +0000
+++ libdbusmenu-glib/Makefile.am 2012-05-03 01:06:23 +0000
@@ -185,10 +185,7 @@
185 GObject-2.0185 GObject-2.0
186Dbusmenu_0_4_gir_CFLAGS = \186Dbusmenu_0_4_gir_CFLAGS = \
187 $(DBUSMENUGLIB_CFLAGS) \187 $(DBUSMENUGLIB_CFLAGS) \
188 $(COVERAGE_CFLAGS) \
189 -I$(top_srcdir)188 -I$(top_srcdir)
190Dbusmenu_0_4_gir_LDFLAGS = \
191 $(COVERAGE_LDFLAGS)
192Dbusmenu_0_4_gir_LIBS = libdbusmenu-glib.la189Dbusmenu_0_4_gir_LIBS = libdbusmenu-glib.la
193Dbusmenu_0_4_gir_FILES = $(introspection_sources)190Dbusmenu_0_4_gir_FILES = $(introspection_sources)
194Dbusmenu_0_4_gir_NAMESPACE = Dbusmenu191Dbusmenu_0_4_gir_NAMESPACE = Dbusmenu
195192
=== modified file 'libdbusmenu-gtk/Makefile.am'
--- libdbusmenu-gtk/Makefile.am 2012-04-11 22:40:03 +0000
+++ libdbusmenu-gtk/Makefile.am 2012-05-03 01:06:23 +0000
@@ -121,10 +121,7 @@
121 Dbusmenu-0.4 121 Dbusmenu-0.4
122DbusmenuGtk_0_4_gir_CFLAGS = \122DbusmenuGtk_0_4_gir_CFLAGS = \
123 $(DBUSMENUGTK_CFLAGS) \123 $(DBUSMENUGTK_CFLAGS) \
124 $(COVERAGE_CFLAGS) \
125 -I$(top_srcdir)124 -I$(top_srcdir)
126DbusmenuGtk_0_4_gir_LDFLAGS = \
127 $(COVERAGE_LDFLAGS)
128DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la \125DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la \
129 $(top_builddir)/libdbusmenu-glib/libdbusmenu-glib.la126 $(top_builddir)/libdbusmenu-glib/libdbusmenu-glib.la
130DbusmenuGtk_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))127DbusmenuGtk_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))

Subscribers

People subscribed via source and target branches

to all changes: