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

Proposed by Charles Kerr on 2012-05-03
Status: Merged
Approved by: Allan LeSage on 2012-05-04
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) 2012-05-03 Approve on 2012-05-04
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.
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
1=== modified file 'libdbusmenu-glib/Makefile.am'
2--- libdbusmenu-glib/Makefile.am 2012-04-11 22:40:03 +0000
3+++ libdbusmenu-glib/Makefile.am 2012-05-03 01:06:23 +0000
4@@ -185,10 +185,7 @@
5 GObject-2.0
6 Dbusmenu_0_4_gir_CFLAGS = \
7 $(DBUSMENUGLIB_CFLAGS) \
8- $(COVERAGE_CFLAGS) \
9 -I$(top_srcdir)
10-Dbusmenu_0_4_gir_LDFLAGS = \
11- $(COVERAGE_LDFLAGS)
12 Dbusmenu_0_4_gir_LIBS = libdbusmenu-glib.la
13 Dbusmenu_0_4_gir_FILES = $(introspection_sources)
14 Dbusmenu_0_4_gir_NAMESPACE = Dbusmenu
15
16=== modified file 'libdbusmenu-gtk/Makefile.am'
17--- libdbusmenu-gtk/Makefile.am 2012-04-11 22:40:03 +0000
18+++ libdbusmenu-gtk/Makefile.am 2012-05-03 01:06:23 +0000
19@@ -121,10 +121,7 @@
20 Dbusmenu-0.4
21 DbusmenuGtk_0_4_gir_CFLAGS = \
22 $(DBUSMENUGTK_CFLAGS) \
23- $(COVERAGE_CFLAGS) \
24 -I$(top_srcdir)
25-DbusmenuGtk_0_4_gir_LDFLAGS = \
26- $(COVERAGE_LDFLAGS)
27 DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la \
28 $(top_builddir)/libdbusmenu-glib/libdbusmenu-glib.la
29 DbusmenuGtk_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))

Subscribers

People subscribed via source and target branches

to all changes: