X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=Makefile.am;h=a09ee4dad8a383aa5df51ea8c3cdd45714109ba2;hb=72136f8418bc7e8a0a5bf3c11215aa49dc679659;hp=d2f9c3b3d77fed4fff7197a907fc588506cd58bc;hpb=886a6f61a1f4cc48a77b42d10f34f9126377d904;p=tinc

diff --git a/Makefile.am b/Makefile.am
index d2f9c3b3..a09ee4da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,24 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 src doc
+SUBDIRS =  src doc test systemd
 
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = have.h system.h COPYING.README gui
+EXTRA_DIST = COPYING.README README.android
+
+@CODE_COVERAGE_RULES@
+
+# 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
 
 ChangeLog:
-	git log > ChangeLog
+	(cd $(srcdir) && git log) > ChangeLog
 
 deb:
 	dpkg-buildpackage -rfakeroot
@@ -23,5 +33,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] test/*.[ch]