cmac: Reset state before doing set_key()

[people/ms/strongswan.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index eb083ec7972cf03347a3142ee02749fb34c38ae1..bea4ba7c0290e2041f007fa6a5500c8a9fea55b2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ Doxyfile :    Doxyfile.in
                sed \
                -e "s:\@PACKAGE_VERSION\@:$(PACKAGE_VERSION):" \
                -e "s:\@PACKAGE_NAME\@:$(PACKAGE_NAME):" \
-               -e "s:\@SRC_DIR\@:$(srcdir):" \
+               -e "s:\@SRC_DIR\@:$(srcdir):g" \
                $(srcdir)/$@.in > $@
 
 apidoc :       Doxyfile
@@ -42,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
@@ -55,7 +55,7 @@ cov-report:
                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 \
+               genhtml --num-spaces 4 --legend --branch-coverage --ignore-errors source \
                                -t "$(PACKAGE_STRING)" \
                                -o $(top_builddir)/coverage/html \
                                -p `readlink -m $(abs_top_srcdir)`/src \
@@ -72,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