Build system: Use Automake's `silent-rules' feature if it's available.

diff --git a/Makefile.am b/Makefile.am
index 656ee8f1d9bb11a488cc8b23cbbfd07741fe49f3..064924628f114819eb0040269977ad7f9d126a31 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -128,6 +128,7 @@ dist_sbin_SCRIPTS    =
 
 ## Making substitutions.
 confsubst = $(top_srcdir)/config/confsubst
+SUBST = $(AM_V_GEN)$(confsubst)
 SUBSTITUTIONS = \
        PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
        PYTHON=$(PYTHON) \
@@ -159,7 +160,7 @@ EXTRA_DIST          += inplace.in
 dist_man_MANS          += inplace.1
 
 inplace: inplace.in Makefile
-       $(confsubst) $(srcdir)/inplace.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/inplace.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 endif
@@ -176,7 +177,7 @@ CLEANFILES          += cdb-assign
 EXTRA_DIST             += cdb-assign.in
 
 cdb-assign: cdb-assign.in Makefile
-       $(confsubst) $(srcdir)/cdb-assign.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/cdb-assign.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 if HAVE_PYMOD_CDB
@@ -188,7 +189,7 @@ CLEANFILES          += cdb-list
 EXTRA_DIST             += cdb-list.in
 
 cdb-list: cdb-list.in Makefile
-       $(confsubst) $(srcdir)/cdb-list.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/cdb-list.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 if HAVE_PYMOD_CDB
@@ -200,7 +201,7 @@ CLEANFILES          += cdb-map
 EXTRA_DIST             += cdb-map.in
 
 cdb-map: cdb-map.in Makefile
-       $(confsubst) $(srcdir)/cdb-map.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/cdb-map.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 endif
@@ -213,14 +214,15 @@ CLEANFILES                += shadowfix
 EXTRA_DIST             += shadowfix.in
 
 shadowfix: shadowfix.in Makefile
-       $(confsubst) $(srcdir)/shadowfix.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/shadowfix.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 man_MANS               += shadowfix.8
 CLEANFILES             += shadowfix.8
 
 shadowfix.8: shadowfix.in
-       pod2man --section 8 $(srcdir)/shadowfix.in >$@.new && mv $@.new $@
+       $(AM_V_GEN)pod2man --section 8 $(srcdir)/shadowfix.in \
+               >$@.new && mv $@.new $@
 
 bin_SCRIPTS            += unfwd
 CLEANFILES             += unfwd
@@ -228,7 +230,7 @@ EXTRA_DIST          += unfwd.in
 dist_man_MANS          += unfwd.1
 
 unfwd: unfwd.in Makefile
-       $(confsubst) $(srcdir)/unfwd.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/unfwd.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 endif
@@ -247,7 +249,7 @@ EXTRA_DIST          += splitconf.in
 dist_man_MANS          += splitconf.1
 
 splitconf: splitconf.in Makefile
-       $(confsubst) $(srcdir)/splitconf.in >$@.new $(SUBSTITUTIONS) && \
+       $(SUBST) $(srcdir)/splitconf.in >$@.new $(SUBSTITUTIONS) && \
                chmod +x $@.new && mv $@.new $@
 
 endif

diff --git a/configure.ac b/configure.ac
index 59f5c94ae1d96e4e211748e568743a74ae235985..3642a8a487922f32e176a9de0352482558eaaa46 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,7 @@ AC_INIT([nsict-utils], AUTO_VERSION, [mdw@distorted.org.uk])
 AC_CONFIG_SRCDIR([shadowfix.in])
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign])
+mdw_SILENT_RULES
 
 AC_CANONICAL_HOST