Allow meshlink_open() to be called with a NULL name.

[meshlink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index eef8e4e831586793db00bfae9be8f7ab9b1d9d38..44a5c8180f3aec9b0a2c6020420d591dfa706f4c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,29 @@
 ## Process this file with automake to get Makefile.in
 
-AUTOMAKE_OPTIONS = gnits
+AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 lib cipher src doc redhat
+if CATTA
+MAYBE_CATTA = catta
+endif
 
-ACLOCAL_AMFLAGS =
+SUBDIRS = $(MAYBE_CATTA) src doc test examples
 
-EXTRA_DIST = 
+DIST_SUBDIRS = $(SUBDIRS)
 
-CVS_CREATED = configure aclocal.m4 config.h.in config.guess \
- config.sub install-sh ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in m4/Makefile.am
+ACLOCAL_AMFLAGS = -I m4 
+
+EXTRA_DIST = \
+       COPYING.README \
+       README.android
 
 ChangeLog:
-       rm -f ChangeLog
-       rcs2log -u "zarq        Ivo Timmermans  itimmermans@bigfoot.com" \
-         -u "guus      Guus Sliepen    guus@sliepen.warande.net" | \
-         sed -e 's,/home/CVS/tinc/cabal/,,g' > $@
-
-cvs-clean: maintainer-clean
-       for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-         rm -f "$$f"; \
-       done
+       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]'`