X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=Makefile.am;h=44a5c8180f3aec9b0a2c6020420d591dfa706f4c;hp=d1b46fd6115e21b8685733b95c25a32572aeecec;hb=fec95d1221c2d7e2059d6ba2fe244211ccee95ad;hpb=8a90de94a1b0e6cdaf51559d44f04a75d5f9ab0e

diff --git a/Makefile.am b/Makefile.am
index d1b46fd6..44a5c818 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,29 @@
 ## Process this file with automake to get Makefile.in
 
-AUTOMAKE_OPTIONS = gnits
+AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 lib cipher src doc redhat
+if CATTA
+MAYBE_CATTA = catta
+endif
 
-ACLOCAL_AMFLAGS =
+SUBDIRS = $(MAYBE_CATTA) src doc test examples
 
-EXTRA_DIST = TODO
+DIST_SUBDIRS = $(SUBDIRS)
 
-CVS_CREATED = configure aclocal.m4 config.h.in config.guess \
- config.sub install-sh ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in m4/Makefile.am
+ACLOCAL_AMFLAGS = -I m4 
+
+EXTRA_DIST = \
+	COPYING.README \
+	README.android
 
 ChangeLog:
-	rm -f ChangeLog
-	rcs2log -u "zarq	Ivo Timmermans	itimmermans@bigfoot.com" \
-	  -u "guus	Guus Sliepen	guus@sliepen.warande.net" | \
-	  sed -e 's,/home/CVS/tinc/cabal/,,g' > $@
-
-cvs-clean: maintainer-clean
-	for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-	  rm -f "$$f"; \
-	done
+	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]'`