X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=4220d3c872487fcea41d6fc8fb6c76619ecd3ba7;hb=dd2cf09a9ac438b65a1f4c9dcff8d87a2b504538;hp=5d8172a24206cb91af41119296f856020c9b0320;hpb=10749179127c681ce040fcf612038174b2bd474a;p=meshlink

diff --git a/Makefile.am b/Makefile.am
index 5d8172a2..4220d3c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,28 @@
 ## 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 = -I m4
+SUBDIRS = $(MAYBE_CATTA) src doc test examples
 
-EXTRA_DIST = TODO
+DIST_SUBDIRS = $(SUBDIRS)
 
-CVS_CREATED = configure aclocal.m4 config.h.in
+ACLOCAL_AMFLAGS = -I m4 
+
+EXTRA_DIST = \
+	COPYING.README \
+	README.android
 
 ChangeLog:
-	rcs2log -u "zarq	Ivo Timmermans	itimmermans@bigfoot.com" | \
-	  sed -e 's,/home/CVS/tinc/cabal/,,g' > $@
-
-cvs-clean: maintainer-clean
-	for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-	  rm "$$f"; \
-	  if [ $$? -ne 0 ] ; then \
-	    echo $$f bestaat niet; \
-	  fi; \
-	done
+	git log > ChangeLog
+
+astyle:
+	astyle --options=.astylerc -nQ \
+		src/*.[ch] \
+		src/ed25519/e*.[ch] \
+		examples/*.[ch] \
+		examples/*.cc \
+		`find test -name '*.[ch]'`