X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=Makefile.am;h=12371406c4ef6bc312e6cf4f5b0d23255457d70e;hp=0a91b08c34c506465b16304939709d1fbd2b4820;hb=f8190b7233871b5b47c3fc8846731d1bbdef78a5;hpb=66e535a729dd5a9e45600ab74dc19c2b4062ee96

diff --git a/Makefile.am b/Makefile.am
index 0a91b08c..12371406 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,26 +2,24 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib cipher src doc po redhat debian
+SUBDIRS =  src doc test systemd bash_completion.d
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = system.h ABOUT-NLS
+EXTRA_DIST = COPYING.README README.android
 
-CVS_CREATED = configure aclocal.m4 config.h.in config.guess \
- config.sub install-sh ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in m4/Makefile.am ChangeLog
+@CODE_COVERAGE_RULES@
 
-ChangeLog:
-	rm -f ChangeLog
-	rcs2log -u "zarq	Ivo Timmermans	itimmermans@bigfoot.com" \
-	  -u "guus	Guus Sliepen	guus@sliepen.warande.net" | \
-	  sed -e 's,/home/CVS/tinc/,,g' > $@
+# 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` ; do\
-	  rm -f "$$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
@@ -29,5 +27,14 @@ deb:
 rpm: dist
 	cp $(distdir).tar.gz /usr/src/redhat/SOURCES/
 	cp redhat/tinc.spec /usr/src/redhat/SOURCES/
-	cd /usr/src/redhat/SOURCES/
-	rpm -bi tinc.spec
+	cd /usr/src/redhat/SOURCES/ && rpm -bb tinc.spec
+
+release:
+	rm -f ChangeLog
+	$(MAKE) ChangeLog
+	echo "Please edit the NEWS file now..."
+	/usr/bin/editor $(srcdir)/NEWS
+	$(MAKE) dist
+
+astyle:
+	astyle --options=.astylerc -nQ src/*.[ch] src/*/*.[ch]