X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=Makefile.am;h=6bf5f5e663eea3489ca252ba0dad9b99623cb845;hb=6debc6c79ba385d35f646e0958f84ace5b8f4b4d;hp=2af113d58730357e2810e06544ff3673756dc278;hpb=57d8c30e4cbecea3b4216e4e650c4c0a3e160ed2;p=tinc

diff --git a/Makefile.am b/Makefile.am
index 2af113d5..6bf5f5e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,48 @@
 ## Process this file with automake to get Makefile.in
 
-AUTOMAKE_OPTIONS = gnits
+AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 lib cipher src doc redhat
+SUBDIRS =  src doc test systemd bash_completion.d
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = TODO
+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:
-	rcs2log -u "zarq	Ivo Timmermans	itimmermans@bigfoot.com" | \
-	  sed -e 's,/home/CVS/tinc/cabal/,,g' > $@
+	(cd $(srcdir) && git log) > ChangeLog
+
+deb:
+	dpkg-buildpackage -rfakeroot
+
+rpm: dist
+	cp $(distdir).tar.gz /usr/src/redhat/SOURCES/
+	cp redhat/tinc.spec /usr/src/redhat/SOURCES/
+	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]