X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=Makefile.am;h=0667a877e07094e617eb2c7d73147e980368a2bf;hp=0a91b08c34c506465b16304939709d1fbd2b4820;hb=7926a156e5b118d06295228e57de0cc9de0433b4;hpb=66e535a729dd5a9e45600ab74dc19c2b4062ee96

diff --git a/Makefile.am b/Makefile.am
index 0a91b08c..0667a877 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,26 +2,17 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib cipher src doc po redhat debian
+SUBDIRS =  m4 lib src doc po
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = system.h ABOUT-NLS
-
-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
+EXTRA_DIST = config.rpath mkinstalldirs system.h COPYING.README depcomp
 
 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/,,g' > $@
+	svn log > ChangeLog
 
-cvs-clean: maintainer-clean
-	for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-	  rm -f "$$f"; \
-	done
+svn-clean: maintainer-clean
+	svn status --no-ignore | sed -n 's/^[?I] \+//p' | tr '\012' '\0' | xargs -r0 rm -rf
 
 deb:
 	dpkg-buildpackage -rfakeroot
@@ -29,5 +20,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
+	$(MAKE) dist