Move repeating MIN/MAX macros into dropin.h.

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 75eea49..6bf5f5e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,18 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  src doc gui test
+SUBDIRS =  src doc test systemd bash_completion.d
 
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = COPYING.README README.android
+EXTRA_DIST = COPYING.README README.md README.android SECURITY.md
+
+@CODE_COVERAGE_RULES@
+
+.PHONY: extra
+extra:
+       $(MAKE) -C $(srcdir)/src extra
+       $(MAKE) -C $(srcdir)/test extra
 
 # If git describe works, force autoconf to run in order to make sure we have the
 # current version number from git in the resulting configure script.
@@ -14,7 +21,10 @@ configure-version:
        -cd $(srcdir) && git describe && autoconf --force
 
 # Triggering the README target means we are building a distribution (make dist).
-README: configure-version
+README: configure-version README.md
+       ln -sf README.md README
+
+CLEANFILES = README
 
 ChangeLog:
        (cd $(srcdir) && git log) > ChangeLog
@@ -33,3 +43,6 @@ release:
        echo "Please edit the NEWS file now..."
        /usr/bin/editor $(srcdir)/NEWS
        $(MAKE) dist
+
+astyle:
+       astyle --options=.astylerc -nQ src/*.[ch] src/*/*.[ch]