Remove explicit distribution rules for m4 scripts.

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d2f9c3b..6f733f5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,19 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 src doc
+SUBDIRS =  src doc gui test
 
 ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = have.h system.h COPYING.README gui
+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