diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 0e08794c1..7e3c72b3b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src man init testing +SUBDIRS = src man conf init testing if USE_SCRIPTS SUBDIRS += scripts @@ -20,6 +20,9 @@ config_includedir = $(ipseclibdir)/include nodist_config_include_HEADERS = config.h endif +# we leave config files behind intentionally so prevent distcheck from complaining +distuninstallcheck_listfiles = find . -type f \! -name '*.conf' -print + Android.common.mk : Android.common.mk.in configure.ac $(AM_V_GEN) \ sed \ @@ -39,7 +42,7 @@ apidoc : Doxyfile cov-reset-common: @rm -rf $(top_builddir)/coverage - @find $(top_builddir)/{src,scripts} -name "*.gcda" -delete + @find $(top_builddir)/src $(top_builddir)/scripts -name "*.gcda" -delete if COVERAGE cov-reset: cov-reset-common @@ -47,10 +50,12 @@ cov-reset: cov-reset-common cov-report: @mkdir $(top_builddir)/coverage - lcov -c -o $(top_builddir)/coverage/coverage.info -d $(top_builddir) + lcov -c -o $(top_builddir)/coverage/coverage.info -d $(top_builddir) \ + --rc lcov_branch_coverage=1 lcov -r $(top_builddir)/coverage/coverage.info '*/tests/*' \ - -o $(top_builddir)/coverage/coverage.cleaned.info - genhtml --num-spaces 4 --legend \ + -o $(top_builddir)/coverage/coverage.cleaned.info \ + --rc lcov_branch_coverage=1 + genhtml --num-spaces 4 --legend --branch-coverage \ -t "$(PACKAGE_STRING)" \ -o $(top_builddir)/coverage/html \ -p `readlink -m $(abs_top_srcdir)`/src \ @@ -67,7 +72,7 @@ coverage: endif clean-local: cov-reset-common - @find $(top_builddir)/{src,scripts} -name "*.gcno" -delete + @find $(top_builddir)/src $(top_builddir)/scripts -name "*.gcno" -delete @rm -rf apidoc .PHONY: cov-reset-common cov-reset cov-report coverage |