X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=Makefile.am;h=489fedf3042ec225e5024344a98985a035d4d0fd;hb=7619f84393f824a84e20e03167304b27d3581ac0;hp=85c2c18680c5199d20f6e628a6ea4b423eb19a94;hpb=748dabdbe93f7439ed7eddf491a556279250e7ac;p=tinc

diff --git a/Makefile.am b/Makefile.am
index 85c2c186..489fedf3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,24 +2,29 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib src doc po redhat
+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 SECURITY.md
 
-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
+.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
 
-cvs-clean: maintainer-clean
-	for f in $(CVS_CREATED) `find -name Makefile.in` tinc-$(VERSION).tar.gz; do\
-	  rm -Rf "$$f"; \
-	done
+# Triggering the README target means we are building a distribution (make dist).
+README: configure-version
+
+ChangeLog:
+	(cd $(srcdir) && git log) > ChangeLog
 
 deb:
 	dpkg-buildpackage -rfakeroot
@@ -33,5 +38,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]