X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=Makefile.am;h=5a8a38df39732e9d95152eec4eaf3c7e465f63e9;hp=306a0ed024349906baf659ece310cd515c9b2d20;hb=0f0bea383106de1a896905fdf8a56f55265bce74;hpb=dced64c5c3625f6d2f0674e9fed14455aabc635e

diff --git a/Makefile.am b/Makefile.am
index 306a0ed0..5a8a38df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,29 +2,33 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 lib src doc po
+if CATTA
+MAYBE_CATTA = catta
+endif
 
-ACLOCAL_AMFLAGS = -I m4 
+SUBDIRS = $(MAYBE_CATTA) src test examples
 
-EXTRA_DIST = config.rpath mkinstalldirs have.h system.h COPYING.README depcomp
+DIST_SUBDIRS = $(SUBDIRS)
 
-ChangeLog:
-	svn log > ChangeLog
+ACLOCAL_AMFLAGS = -I m4 
 
-svn-clean: maintainer-clean
-	svn status --no-ignore | sed -n 's/^[?I] \+//p' | tr '\012' '\0' | xargs -r0 rm -rf
+EXTRA_DIST = \
+	COPYING.README \
+	README.android \
+	$(DX_CONFIG)
 
-deb:
-	dpkg-buildpackage -rfakeroot
+@DX_RULES@
 
-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
+MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
-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]'`