X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=Makefile.am;h=b13689aa35566e99a3c9fe75e84ddd600e2d3132;hp=2af113d58730357e2810e06544ff3673756dc278;hb=d9ad3d313d96d30ef45cd53367dff9a855a396d4;hpb=57d8c30e4cbecea3b4216e4e650c4c0a3e160ed2

diff --git a/Makefile.am b/Makefile.am
index 2af113d5..b13689aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,27 @@
 ## Process this file with automake to get Makefile.in
 
-AUTOMAKE_OPTIONS = gnits
+AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 lib cipher src doc redhat
+SUBDIRS =  m4 lib src doc
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = TODO
+EXTRA_DIST = have.h system.h COPYING.README
 
 ChangeLog:
-	rcs2log -u "zarq	Ivo Timmermans	itimmermans@bigfoot.com" | \
-	  sed -e 's,/home/CVS/tinc/cabal/,,g' > $@
+	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 NEWS
+	$(MAKE) dist