X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=Makefile.am;h=5a8a38df39732e9d95152eec4eaf3c7e465f63e9;hp=419940ed12ff6fe35d99de222482cfe8f412b622;hb=4b6c01b1d5383b1a7417244a31ad4652aab2d5db;hpb=fcd836c609568fab323f4af6dd525de957a6f4cc

diff --git a/Makefile.am b/Makefile.am
index 419940ed..5a8a38df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,38 +2,33 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  m4 lib src doc po
+if CATTA
+MAYBE_CATTA = catta
+endif
+
+SUBDIRS = $(MAYBE_CATTA) src test examples
+
+DIST_SUBDIRS = $(SUBDIRS)
 
 ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = config.rpath mkinstalldirs system.h COPYING.README depcomp
+EXTRA_DIST = \
+	COPYING.README \
+	README.android \
+	$(DX_CONFIG)
+
+@DX_RULES@
 
-CVS_CREATED = ABOUT-NLS INSTALL COPYING configure aclocal.m4 config.h.in config.guess \
- config.sub install-sh ltconfig ltmain.sh missing mkinstalldirs \
- stamp-h.in ChangeLog po/Makefile.in.in \
- po/tinc.pot po/*.sed po/*.header po/*.sin po/Rules-quot \
- src/.libs intl depcomp
+MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
 ChangeLog:
-	cvs2cl -U cvsusers --fsf
-
-cvs-clean: maintainer-clean
-	for f in $(CVS_CREATED) `find . -name Makefile.in` tinc-$(VERSION).tar.gz; do\
-	  rm -Rf "$$f"; \
-	done
-	grep -l gettext `find m4 -type f` | xargs rm -f
-
-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
+	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]'`