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

diff --git a/Makefile.am b/Makefile.am
index 2af113d5..8ee22a7a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,35 @@
 ## Process this file with automake to get Makefile.in
 
-AUTOMAKE_OPTIONS = gnits
+AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 lib cipher src doc redhat
+SUBDIRS = m4 intl lib src doc po redhat debian
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS =
 
-EXTRA_DIST = TODO
+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
 
 ChangeLog:
-	rcs2log -u "zarq	Ivo Timmermans	itimmermans@bigfoot.com" | \
-	  sed -e 's,/home/CVS/tinc/cabal/,,g' > $@
+	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' > $@
+
+cvs-clean: maintainer-clean
+	for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
+	  rm -f "$$f"; \
+	done
+
+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 -bi tinc.spec