Configure minimum reconnect timeouts.

[oweals/tinc.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8ecab33063e07db800c81c28ede34b40d5533249..b09f53164359501aa1cd1983fc941c10dfd161f3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,26 +2,11 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib cipher src doc po redhat debian
+SUBDIRS = m4 src doc
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4 
 
-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
+EXTRA_DIST = COPYING.README README.android
 
 ChangeLog:
-       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/cabal/,,g' > $@
-
-cvs-clean: maintainer-clean
-       for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-         rm -f "$$f"; \
-       done
-
-deb:
-       dpkg-buildpackage -rfakeroot
+       git log > ChangeLog