X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=Makefile.am;h=44a5c8180f3aec9b0a2c6020420d591dfa706f4c;hp=0667a877e07094e617eb2c7d73147e980368a2bf;hb=fec95d1221c2d7e2059d6ba2fe244211ccee95ad;hpb=27c304940a5dbe83fb0f655c5c43150bafed3b63

diff --git a/Makefile.am b/Makefile.am
index 0667a877..44a5c818 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,29 +2,28 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 lib src doc po
+if CATTA
+MAYBE_CATTA = catta
+endif
 
-ACLOCAL_AMFLAGS = -I m4 
-
-EXTRA_DIST = config.rpath mkinstalldirs system.h COPYING.README depcomp
-
-ChangeLog:
-	svn log > ChangeLog
+SUBDIRS = $(MAYBE_CATTA) src doc test examples
 
-svn-clean: maintainer-clean
-	svn status --no-ignore | sed -n 's/^[?I] \+//p' | tr '\012' '\0' | xargs -r0 rm -rf
+DIST_SUBDIRS = $(SUBDIRS)
 
-deb:
-	dpkg-buildpackage -rfakeroot
+ACLOCAL_AMFLAGS = -I m4 
 
-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
+EXTRA_DIST = \
+	COPYING.README \
+	README.android
 
-release:
-	rm -f ChangeLog
-	$(MAKE) ChangeLog
-	echo "Please edit the NEWS file now..."
-	/usr/bin/editor NEWS
-	$(MAKE) dist
+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]'`