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

[meshlink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 95475938e5e383777679d4b36e18605fd8fa1b87..44a5c8180f3aec9b0a2c6020420d591dfa706f4c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,37 +2,28 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib src doc po redhat debian
+if CATTA
+MAYBE_CATTA = catta
+endif
 
-ACLOCAL_AMFLAGS =
+SUBDIRS = $(MAYBE_CATTA) src doc test examples
 
-EXTRA_DIST = system.h ABOUT-NLS COPYING.README
+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 ChangeLog po/Makefile.in \
- po/tinc.pot src/.libs intl
+ACLOCAL_AMFLAGS = -I m4 
+
+EXTRA_DIST = \
+       COPYING.README \
+       README.android
 
 ChangeLog:
-       cvs2cl -U cvsusers --fsf
-
-cvs-clean: maintainer-clean
-       for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-         rm -Rf "$$f"; \
-       done
-
-deb:
-       dpkg-buildpackage -rfakeroot
-
-rpm: dist
-       cp $(distdir).tar.gz /usr/src/redhat/SOURCES/
-       cp redhat/tinc.spec /usr/src/redhat/SOURCES/
-       cd /usr/src/redhat/SOURCES/
-       rpm -bi tinc.spec
-
-release:
-       rm -f ChangeLog
-       $(MAKE) ChangeLog
-       echo "Please edit the NEWS file now..."
-       /usr/bin/editor NEWS
-       $(MAKE) dist
+       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]'`