X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=4220d3c872487fcea41d6fc8fb6c76619ecd3ba7;hb=ae73e19ce57b80c561b81170ab48f3cf6f1a41eb;hp=33bd6c0f634bcc735967ac22f8e3e260d6cbeee6;hpb=e985f6d3cdbebdeb17333bbd3d3c20d4618128cf;p=meshlink

diff --git a/Makefile.am b/Makefile.am
index 33bd6c0f..4220d3c8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,30 +2,27 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib src doc po redhat debian
+if CATTA
+MAYBE_CATTA = catta
+endif
 
-ACLOCAL_AMFLAGS =
+SUBDIRS = $(MAYBE_CATTA) src doc test examples
 
-EXTRA_DIST = system.h ABOUT-NLS COPYING.README
+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
-	cvs2cl -U cvsusers --fsf
-
-cvs-clean: maintainer-clean
-	for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-	  rm -f "$$f"; \
-	done
-
-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 -bi tinc.spec
+	git log > ChangeLog
+
+astyle:
+	astyle --options=.astylerc -nQ \
+		src/*.[ch] \
+		src/ed25519/e*.[ch] \
+		examples/*.[ch] \
+		examples/*.cc \
+		`find test -name '*.[ch]'`