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

diff --git a/Makefile.am b/Makefile.am
index 33bd6c0f..1dc085c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,30 +2,29 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib src doc po redhat debian
+SUBDIRS = src test examples
 
-ACLOCAL_AMFLAGS =
+DIST_SUBDIRS = $(SUBDIRS)
 
-EXTRA_DIST = system.h ABOUT-NLS COPYING.README
+ACLOCAL_AMFLAGS = -I m4 
 
-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
+EXTRA_DIST = \
+	COPYING.README \
+	README.android \
+	$(DX_CONFIG)
+
+@DX_RULES@
+
+MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
 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 --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]'`