aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan LeSage <allan.lesage@canonical.com>2013-08-07 22:44:07 +0000
committerTarmac <Unknown>2013-08-07 22:44:07 +0000
commitad584c15237a829ba055fe57d37cb860ed092426 (patch)
treeef4b55249bf02a923eda13b649d6dce72f733ac4
parent02ddec5485f251aad831ae8439aa5b8717aaab3e (diff)
parent5f1524a83709764c9143a7d850a61854b573c59c (diff)
downloadayatana-indicator-power-ad584c15237a829ba055fe57d37cb860ed092426.tar.gz
ayatana-indicator-power-ad584c15237a829ba055fe57d37cb860ed092426.tar.bz2
ayatana-indicator-power-ad584c15237a829ba055fe57d37cb860ed092426.zip
This restores coverage reporting; we could alternately add the COVERAGE_CFLAGS to SHARED_CFLAGS instead. Fixes: https://bugs.launchpad.net/bugs/1204127.
Approved by Ted Gould, PS Jenkins bot.
-rw-r--r--src/Makefile.am20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index fa51089..0bd4dc3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,7 +55,12 @@ libindicatorpower_upower_a_SOURCES = \
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 @@ libindicatorpower_service_a_SOURCES = \
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 @@ pkglibexec_PROGRAMS = indicator-power-service
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_LDADD = \
indicator_power_service_LDFLAGS = \
$(COVERAGE_LDFLAGS)
-
-