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

diff --git a/Makefile.am b/Makefile.am
index 5d8172a2..19ae3014 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,33 @@
 ## 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
+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 -u "zarq	Ivo Timmermans	itimmermans@bigfoot.com" \
+	  -u "guus	Guus Sliepen	guus@sliepen.warande.net" | \
+	  sed -e 's,/home/CVS/tinc/,,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; \
+	  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