X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=Makefile.am;h=44a5c8180f3aec9b0a2c6020420d591dfa706f4c;hp=8b39f753612a04034b55d40da4e84204a7af5cd4;hb=fec95d1221c2d7e2059d6ba2fe244211ccee95ad;hpb=fc7a1cc27751514e3175c9c50781d724a91d0f0e

diff --git a/Makefile.am b/Makefile.am
index 8b39f753..44a5c818 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,13 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  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 
 
@@ -14,4 +20,10 @@ 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]'`