Add missing code for the duplicate node testcase.

[meshlink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2af113d58730357e2810e06544ff3673756dc278..93bc963224fc5a73a60df159c2d42d7874e6dfa2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,23 @@
 ## Process this file with automake to get Makefile.in
 
-AUTOMAKE_OPTIONS = gnits
+AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 lib cipher src doc redhat
+if CATTA
+MAYBE_CATTA = catta
+endif
 
-ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = $(MAYBE_CATTA) src doc test examples
 
-EXTRA_DIST = TODO
+DIST_SUBDIRS = $(SUBDIRS)
+
+ACLOCAL_AMFLAGS = -I m4 
+
+EXTRA_DIST = \
+       COPYING.README \
+       README.android
 
 ChangeLog:
-       rcs2log -u "zarq        Ivo Timmermans  itimmermans@bigfoot.com" | \
-         sed -e 's,/home/CVS/tinc/cabal/,,g' > $@
+       git log > ChangeLog
+
+astyle:
+       astyle --options=.astylerc -nQ src/*.[ch] src/ed25519/e*.[ch] examples/*.[ch] examples/*.cc test/*.[ch]