X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=Makefile.am;h=177f54996769501616cb344439d71518d7d3a488;hp=419940ed12ff6fe35d99de222482cfe8f412b622;hb=0c7e0210d900185d4c1a9ffd969dc2a26d9523a9;hpb=fcd836c609568fab323f4af6dd525de957a6f4cc

diff --git a/Makefile.am b/Makefile.am
index 419940ed..177f5499 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,26 +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
 
-CVS_CREATED = ABOUT-NLS INSTALL COPYING configure aclocal.m4 config.h.in config.guess \
- config.sub install-sh ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in ChangeLog po/Makefile.in.in \
- po/tinc.pot po/*.sed po/*.header po/*.sin po/Rules-quot \
- src/.libs intl depcomp
+# 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
 
-ChangeLog:
-	cvs2cl -U cvsusers --fsf
+# Triggering the README target means we are building a distribution (make dist).
+README: configure-version
 
-cvs-clean: maintainer-clean
-	for f in $(CVS_CREATED) `find . -name Makefile.in` tinc-$(VERSION).tar.gz; do\
-	  rm -Rf "$$f"; \
-	done
-	grep -l gettext `find m4 -type f` | xargs rm -f
+ChangeLog:
+	(cd $(srcdir) && git log) > ChangeLog
 
 deb:
 	dpkg-buildpackage -rfakeroot
@@ -35,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