Application Menu Indicator

Merge lp:~allanlesage/indicator-appmenu/TDD-fixes into lp:indicator-appmenu/0.4

  1. TDD-fixes
  2. Merge into trunk.0.4
Proposed by Allan LeSage
Status: Merged
Approved by: Charles Kerr
Approved revision: 205
Merged at revision: 204
Proposed branch: lp:~allanlesage/indicator-appmenu/TDD-fixes
Merge into: lp:indicator-appmenu/0.4
Diff against target: 58 lines (+10/-2)
2 files modified
docs/devel/Makefile.am (+3/-1)
src/Makefile.am (+7/-1)
To merge this branch: bzr merge lp:~allanlesage/indicator-appmenu/TDD-fixes
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+102160@code.launchpad.net

Description of the change

Fixes for gcov builds under Charles' direction, including docs fix which broke linking.

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/devel/Makefile.am'
2--- docs/devel/Makefile.am 2012-03-07 20:49:34 +0000
3+++ docs/devel/Makefile.am 2012-04-16 18:47:19 +0000
4@@ -31,4 +31,6 @@
5
6 GTKDOC_CFLAGS = -I$(top_srcdir)/src $(HUD_CFLAGS)
7
8-GTKDOC_LIBS = $(top_builddir)/src/libhud-service.a $(HUD_LIBS)
9+GTKDOC_LIBS = $(top_builddir)/src/libhud-service.a \
10+ $(HUD_LIBS) \
11+ $(COVERAGE_LDFLAGS)
12
13=== modified file 'src/Makefile.am'
14--- src/Makefile.am 2012-03-30 13:32:40 +0000
15+++ src/Makefile.am 2012-04-16 18:47:19 +0000
16@@ -55,7 +55,7 @@
17 -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror -DG_LOG_DOMAIN=\"Indicator-Appmenu\"
18 libappmenu_la_LIBADD = $(INDICATOR_LIBS) -lX11
19 libappmenu_la_LDFLAGS = \
20- $(COVERAGE_CFLAGS) \
21+ $(COVERAGE_LDFLAGS) \
22 -module -avoid-version
23
24 ######################################
25@@ -154,6 +154,9 @@
26 hud_service_LDADD = \
27 libhud-service.a \
28 $(HUD_LIBS)
29+hud_service_LDFLAGS = \
30+ $(COVERAGE_LDFLAGS)
31+
32
33 create-db.c: create-db.sql
34 echo "#include \"create-db.h\"" > $@
35@@ -182,6 +185,7 @@
36
37 hud_cli_LDFLAGS = \
38 $(HUD_LIBS) \
39+ $(COVERAGE_LDFLAGS) \
40 -lreadline -lcurses
41
42
43@@ -207,6 +211,7 @@
44 $(COVERAGE_CFLAGS) \
45 -Wall -Werror
46 hud_dump_application_LDFLAGS = \
47+ $(COVERAGE_LDFLAGS) \
48 $(HUD_LIBS)
49
50 #######################
51@@ -225,6 +230,7 @@
52 $(COVERAGE_CFLAGS) \
53 -Wall -Werror
54 hud_verify_app_info_LDFLAGS = \
55+ $(COVERAGE_LDFLAGS) \
56 $(HUD_LIBS)
57
58 ####################

Subscribers

People subscribed via source and target branches