X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.am;h=54b822050299a77b365686ca6fc262d739fdfe77;hb=d58a84e0f7e69b98d1bda2a0d2796ad9be106ec3;hp=c7ece4a21cdf674938c6f8743975bcdf686e74c9;hpb=1f14b4a1f91f0b76369d3283a6771757e6437a23;p=thirdparty%2Fstrongswan.git

diff --git a/Makefile.am b/Makefile.am
index c7ece4a21c..54b8220502 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,8 @@
-SUBDIRS = src man init testing
+SUBDIRS = src man conf init testing
+
+if USE_FUZZING
+  SUBDIRS += fuzz
+endif
 
 if USE_SCRIPTS
   SUBDIRS += scripts
@@ -20,7 +24,10 @@ config_includedir = $(ipseclibdir)/include
 nodist_config_include_HEADERS = config.h
 endif
 
-Android.common.mk :	Android.common.mk.in configure.in
+# we leave config files behind intentionally so prevent distcheck from complaining
+distuninstallcheck_listfiles = find . -type f \! -name '*.conf' \! -name '*.secrets' -print
+
+Android.common.mk :	Android.common.mk.in configure.ac
 		$(AM_V_GEN) \
 		sed \
 		-e "s:\@PACKAGE_VERSION\@:$(PACKAGE_VERSION):" \
@@ -31,26 +38,34 @@ 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
-		doxygen
+		@test -d apidoc || doxygen
+		@! find Doxyfile $(top_srcdir)/src/ \( -name '*.h' -o -name '*.md' \) -newer apidoc | \
+			grep -q '' || doxygen && touch apidoc
 
-if COVERAGE
-cov-reset:
+cov-reset-common:
 		@rm -rf $(top_builddir)/coverage
-		@find $(top_builddir) -name "*.gcda" -delete
+		@find $(top_builddir)/src $(top_builddir)/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/*' '*/suites/*' '/usr*' \
+			 -o $(abs_top_builddir)/coverage/coverage.cleaned.info \
+			 --rc lcov_branch_coverage=1
+		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 \
-				$(top_builddir)/coverage/coverage.info
+				$(top_builddir)/coverage/coverage.cleaned.info
 		@echo "Coverage Report at $(top_builddir)/coverage/html" >&2
 
 coverage:
@@ -58,12 +73,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 $(top_builddir)/scripts -name "*.gcno" -delete
+		@rm -rf apidoc
+
+.PHONY: cov-reset-common cov-reset cov-report coverage apidoc