X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=Makefile.am;h=4ef11814b4c7fcffa74aed3e43c9a3967e17f437;hp=fd11ce576224ec471de2680ea0596fa8d357e300;hb=21d0e24f1a523ad5fc23b3cddef78a1ae9585ea9;hpb=47992fe59f4c1b4116e4872d59251b143edc6763

diff --git a/Makefile.am b/Makefile.am
index fd11ce57..4ef11814 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,26 +2,14 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib cipher src doc po redhat debian
+SUBDIRS =  m4 lib src doc
 
-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 = have.h system.h COPYING.README README.android
 
 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' > $@
-
-cvs-clean: maintainer-clean
-	for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-	  rm -f "$$f"; \
-	done
+	git log > ChangeLog
 
 deb:
 	dpkg-buildpackage -rfakeroot
@@ -29,5 +17,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