X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=Makefile.am;h=9c245616ebc8e0ad4b1ac1483e7f32e236062548;hb=362b79176439a2eb643612633aa0ff210a6a4d81;hp=0ea29c83b541878dcee692f6e63637887e080016;hpb=1243156a5e03a666b36bc4400f1402243a85c9a7;p=tinc

diff --git a/Makefile.am b/Makefile.am
index 0ea29c83..9c245616 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,35 @@
 ## Process this file with automake to get Makefile.in
 
-AUTOMAKE_OPTIONS = gnits
+AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 lib cipher src doc
+SUBDIRS =  m4 src doc gui test
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = TODO
+EXTRA_DIST = COPYING.README README.android
 
+# 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:
+	-git describe && autoconf --force
+
+# Triggering the README target means we are building a distribution (make dist).
+README: configure-version
+
+ChangeLog:
+	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 NEWS
+	$(MAKE) dist