Add missing code for the duplicate node testcase.

[meshlink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e37864d05f092cce1d5ad72760be88baa82adbc0..93bc963224fc5a73a60df159c2d42d7874e6dfa2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,26 +2,22 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 src doc gui
+if CATTA
+MAYBE_CATTA = catta
+endif
+
+SUBDIRS = $(MAYBE_CATTA) src doc test examples
+
+DIST_SUBDIRS = $(SUBDIRS)
 
 ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = have.h system.h COPYING.README
+EXTRA_DIST = \
+       COPYING.README \
+       README.android
 
 ChangeLog:
        git log > ChangeLog
 
-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 -bb tinc.spec
-
-release:
-       rm -f ChangeLog
-       $(MAKE) ChangeLog
-       echo "Please edit the NEWS file now..."
-       /usr/bin/editor NEWS
-       $(MAKE) dist
+astyle:
+       astyle --options=.astylerc -nQ src/*.[ch] src/ed25519/e*.[ch] examples/*.[ch] examples/*.cc test/*.[ch]