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

diff --git a/Makefile.am b/Makefile.am
index 0667a877..93bc9632 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,29 +2,22 @@
 
 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
+SUBDIRS = $(MAYBE_CATTA) src doc test examples
 
-ChangeLog:
-	svn log > ChangeLog
+DIST_SUBDIRS = $(SUBDIRS)
 
-svn-clean: maintainer-clean
-	svn status --no-ignore | sed -n 's/^[?I] \+//p' | tr '\012' '\0' | xargs -r0 rm -rf
+ACLOCAL_AMFLAGS = -I m4 
 
-deb:
-	dpkg-buildpackage -rfakeroot
+EXTRA_DIST = \
+	COPYING.README \
+	README.android
 
-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
+ChangeLog:
+	git log > ChangeLog
 
-release:
-	rm -f ChangeLog
-	$(MAKE) ChangeLog
-	echo "Please edit the NEWS file now..."
-	/usr/bin/editor NEWS
-	$(MAKE) dist
+astyle:
+	astyle --options=.astylerc -nQ src/*.[ch] src/ed25519/e*.[ch] examples/*.[ch] examples/*.cc test/*.[ch]