X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=Makefile.am;h=6bf5f5e663eea3489ca252ba0dad9b99623cb845;hb=9a018c2e371eb1cef9708ac71653f2f2868895fa;hp=e40199308f239961359e0876ca1634b45065156d;hpb=f81cea3bdc8683b27188cd8f24a2de906a29eb81;p=tinc

diff --git a/Makefile.am b/Makefile.am
index e4019930..6bf5f5e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,32 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 lib src doc po
+SUBDIRS =  src doc test systemd bash_completion.d
 
-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.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
 
 ChangeLog:
-	git log > ChangeLog
+	(cd $(srcdir) && git log) > ChangeLog
 
 deb:
 	dpkg-buildpackage -rfakeroot
@@ -23,5 +41,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]