Enable silent builds by default.

Cleaner build messages make it easier to spot compiler warnings and errors.
Use make V=1 to get the verbose output back.

# Conflicts:
#	configure.ac
#	doc/Makefile.am

diff --git a/configure.ac b/configure.ac
index a1d63c8..cc62e2e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,9 +4,10 @@ AC_PREREQ(2.61)
 AC_INIT([tinc], m4_esyscmd_s((git describe || echo UNKNOWN) | sed 's/release-//'))
 AC_CONFIG_SRCDIR([src/tincd.c])
 AC_GNU_SOURCE
-AM_INIT_AUTOMAKE([std-options subdir-objects nostdinc -Wall])
+AM_INIT_AUTOMAKE([std-options subdir-objects nostdinc silent-rules -Wall])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
+AM_SILENT_RULES([yes])
 
 # Enable GNU extensions.
 # Define this here, not in acconfig's @TOP@ section, since definitions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5c64ffa..4af40a0 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -17,19 +17,19 @@ transform = s/ginstall/install/; @program_transform_name@
 # see GNUmakefile and Makefile.maint.
 
 sample-config.tar.gz: sample-config
-       GZIP=$(GZIP_ENV) $(AMTAR) chozf $@ --exclude .svn $<
+       $(AM_V_GEN)GZIP=$(GZIP_ENV) $(AMTAR) chozf $@ --exclude .svn $<
 
 tincd.8.html: tincd.8
-       w3mman2html $? > $@
+       $(AM_V_GEN)w3mman2html $? > $@
 
 tinc.8.html: tinc.8
-       w3mman2html $? > $@
+       $(AM_V_GEN)w3mman2html $? > $@
 
 tinc-gui.8.html: tinc-gui.8
-       w3mman2html $? > $@
+       $(AM_V_GEN)w3mman2html $? > $@
 
 tinc.conf.5.html: tinc.conf.5
-       w3mman2html $? > $@
+       $(AM_V_GEN)w3mman2html $? > $@
 
 substitute = sed \
        -e s,'@PACKAGE\@',"$(PACKAGE)",g \
@@ -38,18 +38,18 @@ substitute = sed \
        -e s,'@localstatedir\@',"$(localstatedir)",g
 
 tincd.8: tincd.8.in
-       $(substitute) $? > $@
+       $(AM_V_GEN)$(substitute) $? > $@
 
 tinc.8: tinc.8.in
-       $(substitute) $? > $@
+       $(AM_V_GEN)$(substitute) $? > $@
 
 tinc-gui.8: tinc-gui.8.in
-       $(substitute) $? > $@
+       $(AM_V_GEN)$(substitute) $? > $@
 
 tinc.conf.5: tinc.conf.5.in
-       $(substitute) $? > $@
+       $(AM_V_GEN)$(substitute) $? > $@
 
 tincinclude.texi: tincinclude.texi.in
-       $(substitute) $? > $@
+       $(AM_V_GEN)$(substitute) $? > $@
        
 tinc.texi: tincinclude.texi

diff --git a/src/Makefile.am b/src/Makefile.am
index 7de9ecb..bd9115b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,8 +5,8 @@ sbin_PROGRAMS = tincd tinc sptps_test sptps_keypair
 ## Make sure version.c is always rebuilt with the latest git information
 .PHONY: ${srcdir}/version.c version_git.h
 version_git.h:
-       echo >$@
-       -(cd $(srcdir) && git describe) && echo '#define GIT_DESCRIPTION "'`(cd $(srcdir) && git describe) | sed 's/release-//'`'"' >$@
+       $(AM_V_GEN)echo >$@
+       @-(cd $(srcdir) && git describe >/dev/null) && echo '#define GIT_DESCRIPTION "'`(cd $(srcdir) && git describe) | sed 's/release-//'`'"' >$@ ||:
 ${srcdir}/version.c: version_git.h
 
 if LINUX