Allow compiling without support for Catta.

[meshlink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4214689341d8cc5f146b20409294af3889b9dc71..93bc963224fc5a73a60df159c2d42d7874e6dfa2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,22 @@
 
 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]
+       astyle --options=.astylerc -nQ src/*.[ch] src/ed25519/e*.[ch] examples/*.[ch] examples/*.cc test/*.[ch]