Update copyrights, links, email addresses and let Subversion update $Id$ keywords.

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5d8172a..0667a87 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,30 @@
 ## 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 po
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = TODO
-
-CVS_CREATED = configure aclocal.m4 config.h.in
+EXTRA_DIST = config.rpath mkinstalldirs system.h COPYING.README depcomp
 
 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
+       svn log > ChangeLog
+
+svn-clean: maintainer-clean
+       svn status --no-ignore | sed -n 's/^[?I] \+//p' | tr '\012' '\0' | xargs -r0 rm -rf
+
+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