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

diff --git a/Makefile.am b/Makefile.am
index 8b39f753..5a8a38df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,16 +2,33 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  catta src doc test examples
+if CATTA
+MAYBE_CATTA = catta
+endif
+
+SUBDIRS = $(MAYBE_CATTA) src test examples
+
+DIST_SUBDIRS = $(SUBDIRS)
 
 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]'`