diff options
| author | Ted Gould <ted@gould.cx> | 2012-02-14 16:26:21 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-02-14 16:26:21 -0600 |
| commit | 527b493f6ea1272a51d6aed7798f1592f7dfdbb7 (patch) | |
| tree | 1e2972e53bb5ac7fe1ff90861f6030e9383b529e /Makefile.am | |
| parent | 1566633e5f966baf818d413c2166f4815780eedb (diff) | |
| parent | 55cbd83e46951e9ddb0c38e5403470d775297116 (diff) | |
| download | ayatana-indicator-power-527b493f6ea1272a51d6aed7798f1592f7dfdbb7.tar.gz ayatana-indicator-power-527b493f6ea1272a51d6aed7798f1592f7dfdbb7.tar.bz2 ayatana-indicator-power-527b493f6ea1272a51d6aed7798f1592f7dfdbb7.zip | |
* New upstream release.
* Support for hiding of icon and settings for it as well
* Adding a name hint
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 59 |
1 files changed, 41 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 0d4d34b..0ef4362 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,8 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = po - -gsettings_in_file = data/com.canonical.indicator.power.gschema.xml.in -gsettings_SCHEMAS = $(gsettings_in_file:.xml.in=.xml) - -@INTLTOOL_XML_NOMERGE_RULE@ - -@GSETTINGS_RULES@ +SUBDIRS = \ + po \ + data ################### # Indicator Stuff @@ -20,12 +15,14 @@ libpower_la_SOURCES = \ libpower_la_CFLAGS = \ $(UPOWER_CFLAGS) \ $(INDICATOR_CFLAGS) \ + $(COVERAGE_CFLAGS) \ -Wall -Werror \ -DG_LOG_DOMAIN=\"Indicator-Power\" libpower_la_LIBADD = \ $(UPOWER_LIBS) \ $(INDICATOR_LIBS) libpower_la_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ -module \ -avoid-version @@ -34,16 +31,6 @@ libpower_la_LDFLAGS = \ dist_noinst_SCRIPTS = \ autogen.sh -dist_noinst_DATA = \ - data/com.canonical.indicator.power.gschema.xml \ - $(gsettings_in_file) - -CLEANFILES = \ - $(gsettings_SCHEMAS) - -MAINTAINERCLEANFILES = \ - $(gsettings_SCHEMAS:.xml=.valid) - DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall ############################################################ @@ -73,3 +60,39 @@ dist-hook: else \ echo Failed to generate AUTHORS: not a branch >&2; \ fi + + +# Coverage targets + +.PHONY: clean-gcda +clean-gcda: + @echo Removing old coverage results + -find -name '*.gcda' -print | xargs -r rm + +.PHONY: coverage-html generate-coverage-html clean-coverage-html +coverage-html: clean-gcda + -$(MAKE) $(AM_MAKEFLAGS) -k check + $(MAKE) $(AM_MAKEFLAGS) generate-coverage-html + +generate-coverage-html: + @echo Collecting coverage data + $(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool + LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info + +clean-coverage-html: clean-gcda + -$(LCOV) --directory $(top_builddir) -z + -rm -rf coverage.info coveragereport + +.PHONY: coverage-xml generate-coverage-xml clean-coverage-xml +coverage-xml: clean-gcda + -$(MAKE) $(AM_MAKEFLAGS) -k check + $(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml + +generate-coverage-xml: + @echo Generating coverage XML report + $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml + +clean-coverage-xml: clean-gcda + -rm -rf $(top_builddir)/coverage.xml + +clean-local: clean-coverage-html clean-coverage-xml |