Revert "Work around a GCC bug that causes inet_checksum() to give wrong results."

[tinc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6f733f5..1237140 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,22 +2,24 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  src doc gui test
+SUBDIRS =  src doc test systemd bash_completion.d
 
-ACLOCAL_AMFLAGS = -I m4 
+ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = COPYING.README README.android
 
+@CODE_COVERAGE_RULES@
+
 # 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:
-       -git describe && autoconf --force
+       -cd $(srcdir) && git describe && autoconf --force
 
 # Triggering the README target means we are building a distribution (make dist).
 README: configure-version
 
 ChangeLog:
-       git log > ChangeLog
+       (cd $(srcdir) && git log) > ChangeLog
 
 deb:
        dpkg-buildpackage -rfakeroot
@@ -31,5 +33,8 @@ release:
        rm -f ChangeLog
        $(MAKE) ChangeLog
        echo "Please edit the NEWS file now..."
-       /usr/bin/editor NEWS
+       /usr/bin/editor $(srcdir)/NEWS
        $(MAKE) dist
+
+astyle:
+       astyle --options=.astylerc -nQ src/*.[ch] src/*/*.[ch]