X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=4220d3c872487fcea41d6fc8fb6c76619ecd3ba7;hb=92fcf64776730c1788717ac0d5405f0948892cb9;hp=26d555c7155dce48ce32c9b53229c5502562ea7e;hpb=668664d0ea90dc81670cccd7b7d56b36b8360eaa;p=meshlink

diff --git a/Makefile.am b/Makefile.am
index 26d555c7..4220d3c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,27 @@
 
 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 --options=.astylerc -nQ src/*.[ch] src/ed25519/e*.[ch] examples/*.[ch] examples/*.cc test/*.[ch]
+	astyle --options=.astylerc -nQ \
+		src/*.[ch] \
+		src/ed25519/e*.[ch] \
+		examples/*.[ch] \
+		examples/*.cc \
+		`find test -name '*.[ch]'`