X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=93bc963224fc5a73a60df159c2d42d7874e6dfa2;hb=f13d66f20a227a87075f6456f41b83ce269b67f4;hp=130cd6ef8f8bc7dc861e3ba403655b9d8b2ae8e3;hpb=3793cf10da488b9f4f7a1ac71f60bc270bdf31c6;p=meshlink

diff --git a/Makefile.am b/Makefile.am
index 130cd6ef..93bc9632 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,26 +2,22 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 src doc gui
+if CATTA
+MAYBE_CATTA = catta
+endif
+
+SUBDIRS = $(MAYBE_CATTA) src doc test examples
+
+DIST_SUBDIRS = $(SUBDIRS)
 
 ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = have.h system.h COPYING.README README.android
+EXTRA_DIST = \
+	COPYING.README \
+	README.android
 
 ChangeLog:
 	git log > ChangeLog
 
-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 -bb tinc.spec
-
-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]