charon-nm: Correctly set remote auth class for PSK authentication

[thirdparty/strongswan.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index eb083ec7972cf03347a3142ee02749fb34c38ae1..958edc6fe2d19d0fddc7b38e9157d262deaf1fa0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,9 @@
 SUBDIRS = src man conf init testing
 
+if USE_FUZZING
+  SUBDIRS += fuzz
+endif
+
 if USE_SCRIPTS
   SUBDIRS += scripts
 endif
@@ -20,8 +24,13 @@ config_includedir = $(ipseclibdir)/include
 nodist_config_include_HEADERS = config.h
 endif
 
+# we can't (and shouldn't) install/uninstall system files during make distcheck,
+# so override the autodetected path for systemd units
+AM_DISTCHECK_CONFIGURE_FLAGS = \
+       --with-systemdsystemunitdir='$$(prefix)/lib/systemd/system'
+
 # we leave config files behind intentionally so prevent distcheck from complaining
-distuninstallcheck_listfiles = find . -type f \! -name '*.conf' -print
+distuninstallcheck_listfiles = find . -type f \! -name '*.conf' \! -name '*.secrets' -print
 
 Android.common.mk :    Android.common.mk.in configure.ac
                $(AM_V_GEN) \
@@ -34,15 +43,17 @@ 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
 
 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
@@ -52,10 +63,10 @@ cov-report:
                @mkdir $(top_builddir)/coverage
                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 \
+               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 \
+               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 +83,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
+.PHONY: cov-reset-common cov-reset cov-report coverage apidoc