X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=Makefile.am;h=8e43fe52673a99944e414974bbf0789a5b9559c0;hp=d1b46fd6115e21b8685733b95c25a32572aeecec;hb=99763e34d52fcfe76b0bb9c7f3a17ace51cfdbfc;hpb=8a90de94a1b0e6cdaf51559d44f04a75d5f9ab0e

diff --git a/Makefile.am b/Makefile.am
index d1b46fd6..8e43fe52 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,24 +1,15 @@
 ## Process this file with automake to get Makefile.in
 
-AUTOMAKE_OPTIONS = gnits
+AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 lib cipher src doc redhat
+SUBDIRS = src doc systemd
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = TODO
-
-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
+EXTRA_DIST = COPYING.README 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' > $@
+	git log > ChangeLog
 
-cvs-clean: maintainer-clean
-	for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-	  rm -f "$$f"; \
-	done
+astyle:
+	astyle --options=.astylerc -nQ src/*.[ch] src/*/*.[ch]