Remove unnecessary status bitfield conversions.

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d2f9c3b..0956cbe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,38 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 src doc
+SUBDIRS =  src doc test systemd bash_completion.d
 
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = have.h system.h COPYING.README gui
+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.
+configure-version:
+       -cd $(srcdir) && git describe && autoconf --force
+
+# Triggering the README target means we are building a distribution (make dist).
+README: configure-version README.md
+       ln -sf README.md README
+
+CLEANFILES = README
+
+# If we're running on a CI server, we may not be able to remove some test
+# artifacts without using sudo because they are created by tincd running
+# with root privileges.
+clean-local:
+       if test -n "${CI}"; then sudo rm -rf test/*.test.*/; fi
 
 ChangeLog:
-       git log > ChangeLog
+       (cd $(srcdir) && git log) > ChangeLog
 
 deb:
        dpkg-buildpackage -rfakeroot
@@ -23,5 +47,8 @@ release:
        rm -f ChangeLog
        $(MAKE) ChangeLog
        echo "Please edit the NEWS file now..."
-       /usr/bin/editor NEWS
+       /usr/bin/editor $(srcdir)/NEWS
        $(MAKE) dist
+
+astyle:
+       astyle --options=.astylerc -nQ src/*.[ch] src/*/*.[ch]