Add missing code for the duplicate node testcase.

[meshlink] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c8cc84cd81848f2890aa34952470da89b0bbf207..93bc963224fc5a73a60df159c2d42d7874e6dfa2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,37 +2,22 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib src doc po redhat
+if CATTA
+MAYBE_CATTA = catta
+endif
 
-ACLOCAL_AMFLAGS =
+SUBDIRS = $(MAYBE_CATTA) src doc test examples
 
-EXTRA_DIST = system.h COPYING.README
+DIST_SUBDIRS = $(SUBDIRS)
 
-CVS_CREATED = ABOUT-NLS 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.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 --options=.astylerc -nQ src/*.[ch] src/ed25519/e*.[ch] examples/*.[ch] examples/*.cc test/*.[ch]