X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=4220d3c872487fcea41d6fc8fb6c76619ecd3ba7;hb=55010e8cd9fad4996db774aab3d578b431f9ee73;hp=0ea29c83b541878dcee692f6e63637887e080016;hpb=1243156a5e03a666b36bc4400f1402243a85c9a7;p=meshlink

diff --git a/Makefile.am b/Makefile.am
index 0ea29c83..4220d3c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,28 @@
 ## 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 \
+		`find test -name '*.[ch]'`