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

diff --git a/Makefile.am b/Makefile.am
index c8cc84cd..177f5499 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,24 +2,22 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib src doc po redhat
+SUBDIRS =  src doc gui test systemd
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = system.h COPYING.README
+EXTRA_DIST = COPYING.README README.android
 
-CVS_CREATED = ABOUT-NLS configure aclocal.m4 config.h.in config.guess \
- config.sub install-sh ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in m4/Makefile.am ChangeLog po/Makefile.in.in \
- po/tinc.pot src/.libs intl
+# 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` ; do\
-	  rm -Rf "$$f"; \
-	done
+ChangeLog:
+	(cd $(srcdir) && git log) > ChangeLog
 
 deb:
 	dpkg-buildpackage -rfakeroot
@@ -27,12 +25,11 @@ deb:
 rpm: dist
 	cp $(distdir).tar.gz /usr/src/redhat/SOURCES/
 	cp redhat/tinc.spec /usr/src/redhat/SOURCES/
-	cd /usr/src/redhat/SOURCES/
-	rpm -bi tinc.spec
+	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
+	/usr/bin/editor $(srcdir)/NEWS
 	$(MAKE) dist