X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=Makefile.am;h=8462e685799c429c59fbbb07931d3898834a0237;hp=8ee22a7a845d24e0cc193b7ac3e270a901b5002f;hb=c3593491d44e8e8f239bb297f5d5f6541d581b78;hpb=84c842def74c5d0e9c4a69e4f584fe9eb66eb728

diff --git a/Makefile.am b/Makefile.am
index 8ee22a7a..8462e685 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,28 +2,26 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib src doc po redhat debian
+SUBDIRS =  m4 lib src doc po
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = system.h ABOUT-NLS
+EXTRA_DIST = config.rpath mkinstalldirs system.h COPYING.README depcomp
 
-CVS_CREATED = configure aclocal.m4 config.h.in config.guess \
+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
+ stamp-h.in m4/Makefile.am ChangeLog po/Makefile.in.in \
+ po/tinc.pot po/*.sed po/*.header po/*.sin po/Rules-quot \
+ src/.libs intl depcomp
 
 ChangeLog:
-	rm -f ChangeLog
-	rcs2log -r -r -r CABAL \
-	  -u "zarq	Ivo Timmermans	itimmermans@bigfoot.com" \
-	  -u "guus	Guus Sliepen	guus@sliepen.warande.net" \
-	  -u "wsl	Wessel Dankers	wsl@nl.linux.org" | \
-	  sed -e 's,/home/CVS/tinc/,,g' > $@
+	cvs2cl -U cvsusers --fsf
 
 cvs-clean: maintainer-clean
-	for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-	  rm -f "$$f"; \
+	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
 
 deb:
 	dpkg-buildpackage -rfakeroot
@@ -31,5 +29,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