charon-tkm: Drop unnecessary include
[strongswan.git] / Makefile.am
index c7ece4a..687d896 100644 (file)
@@ -20,7 +20,7 @@ config_includedir = $(ipseclibdir)/include
 nodist_config_include_HEADERS = config.h
 endif
 
-Android.common.mk :    Android.common.mk.in configure.in
+Android.common.mk :    Android.common.mk.in configure.ac
                $(AM_V_GEN) \
                sed \
                -e "s:\@PACKAGE_VERSION\@:$(PACKAGE_VERSION):" \
@@ -37,20 +37,26 @@ Doxyfile :  Doxyfile.in
 apidoc :       Doxyfile
                doxygen
 
-if COVERAGE
-cov-reset:
+cov-reset-common:
                @rm -rf $(top_builddir)/coverage
-               @find $(top_builddir) -name "*.gcda" -delete
+               @find $(top_builddir)/{src,scripts} -name "*.gcda" -delete
+
+if COVERAGE
+cov-reset: cov-reset-common
                @lcov --zerocounters --directory $(top_builddir)
 
 cov-report:
                @mkdir $(top_builddir)/coverage
-               lcov -c -o $(top_builddir)/coverage/coverage.info -d $(top_builddir)
-               genhtml --num-spaces 4 --legend \
+               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 \
+                        --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 \
-                               $(top_builddir)/coverage/coverage.info
+                               $(top_builddir)/coverage/coverage.cleaned.info
                @echo "Coverage Report at $(top_builddir)/coverage/html" >&2
 
 coverage:
@@ -58,12 +64,12 @@ coverage:
                @$(MAKE) check
                @$(MAKE) cov-report
 else
-cov-reset:
-
 coverage:
                @echo "reconfigure with --enable-coverage"
 endif
 
-clean-local:
-               @$(MAKE) cov-reset
-               rm -rf apidoc
+clean-local: cov-reset-common
+               @find $(top_builddir)/{src,scripts} -name "*.gcno" -delete
+               @rm -rf apidoc
+
+.PHONY: cov-reset-common cov-reset cov-report coverage