X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=Makefile.am;h=2b21abb66083fbd9bf1ea7516e60636745f93bdb;hb=a742ea4d040ecfaabbc875c63f2625654ce68923;hp=e37864d05f092cce1d5ad72760be88baa82adbc0;hpb=f5dc136cfd7a3a195b75f7174722734e25f30fd9;p=tinc

diff --git a/Makefile.am b/Makefile.am
index e37864d0..2b21abb6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,24 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 src doc gui
+SUBDIRS =  src doc gui test systemd
 
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = have.h system.h COPYING.README
+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]