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

diff --git a/Makefile.am b/Makefile.am
index 321f5144..177f5499 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,26 +2,34 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 lib cipher src doc redhat debian
+SUBDIRS =  src doc gui test systemd
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = 
+EXTRA_DIST = COPYING.README README.android
 
-CVS_CREATED = configure aclocal.m4 config.h.in config.guess \
- config.sub install-sh ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in m4/Makefile.am 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
 
-ChangeLog:
-	rm -f ChangeLog
-	rcs2log -u "zarq	Ivo Timmermans	itimmermans@bigfoot.com" \
-	  -u "guus	Guus Sliepen	guus@sliepen.warande.net" | \
-	  sed -e 's,/home/CVS/tinc/cabal/,,g' > $@
+# 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 -f "$$f"; \
-	done
+ChangeLog:
+	(cd $(srcdir) && 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 $(srcdir)/NEWS
+	$(MAKE) dist