Never automatically try to bind to ports >= 32768.

[meshlink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 93bc963224fc5a73a60df159c2d42d7874e6dfa2..1dc085c0c0d1fc672f8f3315641baa2813a89508 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,11 +2,7 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-if CATTA
-MAYBE_CATTA = catta
-endif
-
-SUBDIRS = $(MAYBE_CATTA) src doc test examples
+SUBDIRS = src test examples
 
 DIST_SUBDIRS = $(SUBDIRS)
 
@@ -14,10 +10,21 @@ ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = \
        COPYING.README \
-       README.android
+       README.android \
+       $(DX_CONFIG)
+
+@DX_RULES@
+
+MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
 ChangeLog:
        git log > ChangeLog
 
 astyle:
-       astyle --options=.astylerc -nQ src/*.[ch] src/ed25519/e*.[ch] examples/*.[ch] examples/*.cc test/*.[ch]
+       @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]'`