Merge lp:~allanlesage/indicator-power/restore-coverage-flags into lp:indicator-power/13.10

[Allan LeSage]

This restores coverage reporting; we could alternately add the COVERAGE_CFLAGS to SHARED_CFLAGS instead.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:184
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/45/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-saucy-armhf-ci/16

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-power-ci/45/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

Makes sense to me. We probably want to leave SHARED_CFLAGS for things
like generated code anyway.

  review approve
  status approved

review: Approve

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-07-04 20:14:54 +0000
+++ src/Makefile.am	2013-08-07 21:10:42 +0000
@@ -55,7 +55,12 @@
   device-provider-upower.c \
   device-provider-upower.h
 
-libindicatorpower_upower_a_CFLAGS = $(SHARED_CFLAGS) -Wno-unused-parameter
+libindicatorpower_upower_a_CFLAGS = \
+	$(SHARED_CFLAGS) \
+	-Wno-unused-parameter \
+	$(COVERAGE_CFLAGS)
+
+libindciatorpower_upower_a_LDFLAGS = $(COVERAGE_LDFLAGS)
 
 libindicatorpower_service_a_SOURCES = \
   device-provider.c \
@@ -65,7 +70,12 @@
   service.c \
   service.h
 
-libindicatorpower_service_a_CFLAGS = $(SHARED_CFLAGS) -Wno-missing-field-initializers
+libindicatorpower_service_a_CFLAGS = \
+	$(SHARED_CFLAGS) \
+	-Wno-missing-field-initializers \
+	$(COVERAGE_CFLAGS)
+
+libindicatorpower_service_a_LDFLAGS = $(COVERAGE_LDFLAGS)
 
 ###
 ###
@@ -75,7 +85,9 @@
 
 indicator_power_service_SOURCES = main.c
 
-indicator_power_service_CFLAGS = $(SHARED_CFLAGS)
+indicator_power_service_CFLAGS = \
+	$(SHARED_CFLAGS) \
+	$(COVERAGE_CFLAGS)
 
 indicator_power_service_LDADD = \
   libindicatorpower-upower.a \
@@ -84,5 +96,3 @@
 
 indicator_power_service_LDFLAGS = \
   $(COVERAGE_LDFLAGS)
-
-