X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=93bc963224fc5a73a60df159c2d42d7874e6dfa2;hb=f13d66f20a227a87075f6456f41b83ce269b67f4;hp=54775b07799aa349b5c38bf5aea51f25454bae37;hpb=a3ccc15ac0979c4103f98e740b525634e8e17a0a;p=meshlink

diff --git a/Makefile.am b/Makefile.am
index 54775b07..93bc9632 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,23 +2,22 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 lib cipher src doc redhat debian
+if CATTA
+MAYBE_CATTA = catta
+endif
 
-ACLOCAL_AMFLAGS =
+SUBDIRS = $(MAYBE_CATTA) src doc test examples
 
-EXTRA_DIST = 
+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 ChangeLog
+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 --options=.astylerc -nQ src/*.[ch] src/ed25519/e*.[ch] examples/*.[ch] examples/*.cc test/*.[ch]