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

[meshlink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d2f9c3b3d77fed4fff7197a907fc588506cd58bc..5a8a38df39732e9d95152eec4eaf3c7e465f63e9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,26 +2,33 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 src doc
+if CATTA
+MAYBE_CATTA = catta
+endif
+
+SUBDIRS = $(MAYBE_CATTA) src test examples
+
+DIST_SUBDIRS = $(SUBDIRS)
 
 ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = have.h system.h COPYING.README gui
+EXTRA_DIST = \
+       COPYING.README \
+       README.android \
+       $(DX_CONFIG)
 
-ChangeLog:
-       git log > ChangeLog
+@DX_RULES@
 
-deb:
-       dpkg-buildpackage -rfakeroot
+MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
-rpm: dist
-       cp $(distdir).tar.gz /usr/src/redhat/SOURCES/
-       cp redhat/tinc.spec /usr/src/redhat/SOURCES/
-       cd /usr/src/redhat/SOURCES/ && rpm -bb tinc.spec
+ChangeLog:
+       git log > ChangeLog
 
-release:
-       rm -f ChangeLog
-       $(MAKE) ChangeLog
-       echo "Please edit the NEWS file now..."
-       /usr/bin/editor NEWS
-       $(MAKE) dist
+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]'`