X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=Makefile.am;h=bfaf557d9ba0708253704fefeb42d421a374648f;hp=63602fc83e1b256302da7832ad2e51e582a799d6;hb=3fae14fae5a347823679ef694ab630b4991a201d;hpb=353a9230bb70b70028f2dc6c651a28e30b13dc63

diff --git a/Makefile.am b/Makefile.am
index 63602fc8..bfaf557d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,37 +2,14 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = m4 intl lib src doc po redhat
+SUBDIRS = src doc distro
 
-ACLOCAL_AMFLAGS =
+ACLOCAL_AMFLAGS = -I m4 
 
-EXTRA_DIST = system.h ABOUT-NLS COPYING.README
-
-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 po/Makefile.in \
- po/tinc.pot src/.libs intl
+EXTRA_DIST = COPYING.README README.android
 
 ChangeLog:
-	cvs2cl -U cvsusers --fsf
-
-cvs-clean: maintainer-clean
-	for f in $(CVS_CREATED) `find -name Makefile.in` ; do\
-	  rm -Rf "$$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
 
-release:
-	rm -f ChangeLog
-	$(MAKE) ChangeLog
-	echo "Please edit the NEWS file now..."
-	/usr/bin/editor NEWS
-	$(MAKE) dist
+astyle:
+	astyle --options=.astylerc -nQ src/*.[ch] src/*/*.[ch]