X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=Makefile.am;h=177f54996769501616cb344439d71518d7d3a488;hp=0667a877e07094e617eb2c7d73147e980368a2bf;hb=d4410d0cce40929db9a0ce7042ef962f1867234d;hpb=42e01abd54bd36ee84a45a2b646cfa27034de8d1

diff --git a/Makefile.am b/Makefile.am
index 0667a877..177f5499 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,17 +2,22 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 lib src doc po
+SUBDIRS =  src doc gui test systemd
 
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = config.rpath mkinstalldirs system.h COPYING.README depcomp
+EXTRA_DIST = COPYING.README README.android
 
-ChangeLog:
-	svn log > ChangeLog
+# 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
 
-svn-clean: maintainer-clean
-	svn status --no-ignore | sed -n 's/^[?I] \+//p' | tr '\012' '\0' | xargs -r0 rm -rf
+ChangeLog:
+	(cd $(srcdir) && git log) > ChangeLog
 
 deb:
 	dpkg-buildpackage -rfakeroot
@@ -26,5 +31,5 @@ release:
 	rm -f ChangeLog
 	$(MAKE) ChangeLog
 	echo "Please edit the NEWS file now..."
-	/usr/bin/editor NEWS
+	/usr/bin/editor $(srcdir)/NEWS
 	$(MAKE) dist