Allow meshlink_open() to be called with a NULL name.

[meshlink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3bf6bdee8f72580cc66d55bfde4e635eb9aef843..44a5c8180f3aec9b0a2c6020420d591dfa706f4c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,28 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 catta src doc test examples
+if CATTA
+MAYBE_CATTA = catta
+endif
+
+SUBDIRS = $(MAYBE_CATTA) src doc test examples
+
+DIST_SUBDIRS = $(SUBDIRS)
 
 ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = README.android
+EXTRA_DIST = \
+       COPYING.README \
+       README.android
 
 ChangeLog:
        git log > ChangeLog
+
+astyle:
+       @astyle --version | grep -q "Version 3" || (echo 'ERROR: astyle version 3 required!' 1>&2 && exit 1)
+       astyle --options=.astylerc -nQ \
+               src/*.[ch] \
+               src/ed25519/e*.[ch] \
+               examples/*.[ch] \
+               examples/*.cc \
+               `find test -name '*.[ch]'`