Don't use assert() to check the results of pthread_*() calls.

[meshlink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0ea29c83b541878dcee692f6e63637887e080016..5a8a38df39732e9d95152eec4eaf3c7e465f63e9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,34 @@
 ## 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 test examples
 
-EXTRA_DIST = TODO
+DIST_SUBDIRS = $(SUBDIRS)
 
+ACLOCAL_AMFLAGS = -I m4 
+
+EXTRA_DIST = \
+       COPYING.README \
+       README.android \
+       $(DX_CONFIG)
+
+@DX_RULES@
+
+MOSTLYCLEANFILES = $(DX_CLEANFILES)
+
+ChangeLog:
+       git log > ChangeLog
+
+astyle:
+       @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]'`