X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=Makefile.am;h=12371406c4ef6bc312e6cf4f5b0d23255457d70e;hp=1c152cae8b35de4cf3e889c38034bf07668e42f5;hb=f8190b7233871b5b47c3fc8846731d1bbdef78a5;hpb=3cbe67a8de1da7bd042474de4d16cb4f7e9822ab

diff --git a/Makefile.am b/Makefile.am
index 1c152cae..12371406 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,24 +2,24 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib src doc po
+SUBDIRS =  src doc test systemd bash_completion.d
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = system.h COPYING.README
+EXTRA_DIST = COPYING.README README.android
 
-CVS_CREATED = ABOUT-NLS configure aclocal.m4 config.h.in config.guess \
- config.sub install-sh ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in m4/Makefile.am ChangeLog po/Makefile.in.in \
- po/tinc.pot src/.libs intl
+@CODE_COVERAGE_RULES@
 
-ChangeLog:
-	cvs2cl -U cvsusers --fsf
+# 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
 
-cvs-clean: maintainer-clean
-	for f in $(CVS_CREATED) `find . -name Makefile.in` tinc-$(VERSION).tar.gz; do\
-	  rm -Rf "$$f"; \
-	done
+ChangeLog:
+	(cd $(srcdir) && git log) > ChangeLog
 
 deb:
 	dpkg-buildpackage -rfakeroot
@@ -33,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]