X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=Makefile.am;h=b13689aa35566e99a3c9fe75e84ddd600e2d3132;hp=5d8172a24206cb91af41119296f856020c9b0320;hb=a07aa92176571eb7f063708640d0d486280808ef;hpb=10749179127c681ce040fcf612038174b2bd474a

diff --git a/Makefile.am b/Makefile.am
index 5d8172a2..b13689aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +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
-
-CVS_CREATED = configure aclocal.m4 config.h.in
+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' > $@
-
-cvs-clean: maintainer-clean
-	for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-	  rm "$$f"; \
-	  if [ $$? -ne 0 ] ; then \
-	    echo $$f bestaat niet; \
-	  fi; \
-	done
+	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