tinc-gui: Reformat codebase according to PEP8

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2af113d..177f549 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,35 @@
 ## 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 gui test systemd
 
 ACLOCAL_AMFLAGS = -I m4
 
-EXTRA_DIST = TODO
+EXTRA_DIST = COPYING.README README.android
+
+# If git describe works, force autoconf to run in order to make sure we have the
+# current version number from git in the resulting configure script.
+configure-version:
+       -cd $(srcdir) && git describe && autoconf --force
+
+# Triggering the README target means we are building a distribution (make dist).
+README: configure-version
 
 ChangeLog:
-       rcs2log -u "zarq        Ivo Timmermans  itimmermans@bigfoot.com" | \
-         sed -e 's,/home/CVS/tinc/cabal/,,g' > $@
+       (cd $(srcdir) && git log) > ChangeLog
+
+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 $(srcdir)/NEWS
+       $(MAKE) dist