Allow compiling without support for Catta.

[meshlink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0ea29c83b541878dcee692f6e63637887e080016..93bc963224fc5a73a60df159c2d42d7874e6dfa2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,23 @@
 ## Process this file with automake to get Makefile.in
 
-AUTOMAKE_OPTIONS = gnits
+AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 lib cipher src doc
+if CATTA
+MAYBE_CATTA = catta
+endif
 
-ACLOCAL_AMFLAGS = -I m4
+SUBDIRS = $(MAYBE_CATTA) src doc test examples
 
-EXTRA_DIST = TODO
+DIST_SUBDIRS = $(SUBDIRS)
 
+ACLOCAL_AMFLAGS = -I m4 
+
+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]