Subnet Cache hashtable improvements

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0a91b08..6bf5f5e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,26 +2,32 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib cipher src doc po redhat debian
+SUBDIRS =  src doc test systemd bash_completion.d
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = system.h ABOUT-NLS
+EXTRA_DIST = COPYING.README README.md README.android SECURITY.md
 
-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
+@CODE_COVERAGE_RULES@
 
-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/,,g' > $@
+.PHONY: extra
+extra:
+       $(MAKE) -C $(srcdir)/src extra
+       $(MAKE) -C $(srcdir)/test extra
+
+# If git describe works, force autoconf to run in order to make sure we have the
+# current version number from git in the resulting configure script.
+configure-version:
+       -cd $(srcdir) && git describe && autoconf --force
 
-cvs-clean: maintainer-clean
-       for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-         rm -f "$$f"; \
-       done
+# Triggering the README target means we are building a distribution (make dist).
+README: configure-version README.md
+       ln -sf README.md README
+
+CLEANFILES = README
+
+ChangeLog:
+       (cd $(srcdir) && git log) > ChangeLog
 
 deb:
        dpkg-buildpackage -rfakeroot
@@ -29,5 +35,14 @@ deb:
 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
+       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 $(srcdir)/NEWS
+       $(MAKE) dist
+
+astyle:
+       astyle --options=.astylerc -nQ src/*.[ch] src/*/*.[ch]