X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=Makefile.am;h=0810d4f893bb319ad4adc1363e4dc7ef4ee0c47f;hp=3a8e51fea783bac2b7e5249c3977e5339dc505db;hb=ee5e3404e49ef08437cd6b6e4c5b83d190efa053;hpb=4c85542894f7fca823b119b05e07179deb24229a

diff --git a/Makefile.am b/Makefile.am
index 3a8e51fe..0810d4f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,22 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 lib src doc
+SUBDIRS =  src doc gui test systemd
 
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = config.rpath mkinstalldirs have.h system.h COPYING.README depcomp
+EXTRA_DIST = COPYING.README README.android
+
+# 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 +31,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]