X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=Makefile.am;h=f7de2b765361c451624fc137f3f3442ce6965f8a;hb=7afe8daaf5ba221968a3e2beff61fa653f497cb1;hp=fd11ce576224ec471de2680ea0596fa8d357e300;hpb=47992fe59f4c1b4116e4872d59251b143edc6763;p=meshlink

diff --git a/Makefile.am b/Makefile.am
index fd11ce57..f7de2b76 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,32 +2,14 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib cipher src doc po redhat debian
+SUBDIRS =  catta src doc test examples
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = system.h ABOUT-NLS
-
-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 = 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
-
-deb:
-	dpkg-buildpackage -rfakeroot
+	git log > ChangeLog
 
-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
+astyle:
+	astyle --options=.astylerc -nQ src/*.[ch] src/ed25519/e*.[ch] examples/*.[ch] examples/*.cc test/*.[ch]