From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 22 May 2010 11:43:56 +0000 (+0100)
Subject: Build system: Use Automake 1.11 `silent-rules'.
X-Git-Tag: 1.0.0pre10~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/commitdiff_plain/2171b19e5662e40fcbfef34da561e70265974e79

Build system: Use Automake 1.11 `silent-rules'.

This makes warnings much easier to spot in the build transcript.
---

diff --git a/Makefile.am b/Makefile.am
index 7cbef362..3984556b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,7 +79,7 @@ EXTRA_DIST		+= tripe.pc.in
 CLEANFILES		+= tripe.pc
 
 tripe.pc: tripe.pc.in Makefile
-	$(confsubst) $(srcdir)/tripe.pc.in >$@.new $(SUBSTITUTIONS) && \
+	$(SUBST) $(srcdir)/tripe.pc.in >$@.new $(SUBSTITUTIONS) && \
 		mv $@.new $@
 
 ###--------------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 3ad53dc8..54caf9d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,7 @@ AC_INIT([tripe], AUTO_VERSION, [mdw@distorted.org.uk])
 AC_CONFIG_SRCDIR([server/tripe.h])
 AC_CONFIG_AUX_DIR([config])
 AM_INIT_AUTOMAKE([foreign])
+mdw_SILENT_RULES
 
 AC_PROG_CC
 AM_PROG_CC_C_O
diff --git a/init/Makefile.am b/init/Makefile.am
index e8d662d5..0ce08512 100644
--- a/init/Makefile.am
+++ b/init/Makefile.am
@@ -37,7 +37,7 @@ EXTRA_DIST		+= tripe-init.in
 CLEANFILES		+= tripe-init
 
 tripe-init: tripe-init.in Makefile
-	$(confsubst) $(srcdir)/tripe-init.in >$@.new $(SUBSTITUTIONS) && \
+	$(SUBST) $(srcdir)/tripe-init.in >$@.new $(SUBSTITUTIONS) && \
 		chmod +x $@.new && mv $@.new $@
 
 ## Configuration file for the script.
diff --git a/keys/Makefile.am b/keys/Makefile.am
index b0e295bb..68a0d221 100644
--- a/keys/Makefile.am
+++ b/keys/Makefile.am
@@ -37,7 +37,7 @@ EXTRA_DIST		+= tripe-keys.in
 CLEANFILES		+= tripe-keys
 
 tripe-keys: tripe-keys.in Makefile
-	$(confsubst) $(srcdir)/tripe-keys.in >$@.new $(SUBSTITUTIONS) && \
+	$(SUBST) $(srcdir)/tripe-keys.in >$@.new $(SUBSTITUTIONS) && \
 		chmod +x $@.new && mv $@.new $@
 
 ## Manual pages.
diff --git a/mon/Makefile.am b/mon/Makefile.am
index d3053b1b..128c35e3 100644
--- a/mon/Makefile.am
+++ b/mon/Makefile.am
@@ -37,7 +37,7 @@ EXTRA_DIST		+= tripemon.in
 CLEANFILES		+= tripemon
 
 tripemon: tripemon.in Makefile
-	$(confsubst) $(srcdir)/tripemon.in >$@.new $(SUBSTITUTIONS) && \
+	$(SUBST) $(srcdir)/tripemon.in >$@.new $(SUBSTITUTIONS) && \
 		chmod +x $@.new && mv $@.new $@
 
 ## Manual page.
diff --git a/peerdb/Makefile.am b/peerdb/Makefile.am
index c6064746..3688a3f2 100644
--- a/peerdb/Makefile.am
+++ b/peerdb/Makefile.am
@@ -36,8 +36,7 @@ CLEANFILES		+= tripe-newpeers
 EXTRA_DIST		+= tripe-newpeers.in
 
 tripe-newpeers: tripe-newpeers.in Makefile
-	$(confsubst) $(srcdir)/tripe-newpeers.in >$@.new \
-		$(SUBSTITUTIONS) && \
+	$(SUBST) $(srcdir)/tripe-newpeers.in >$@.new $(SUBSTITUTIONS) && \
 		chmod +x $@.new && mv $@.new $@
 
 ## Manual pages.
diff --git a/py/Makefile.am b/py/Makefile.am
index 46446560..03163bac 100644
--- a/py/Makefile.am
+++ b/py/Makefile.am
@@ -40,7 +40,7 @@ CLEANFILES		+= tripe.py
 EXTRA_DIST		+= tripe.py.in
 
 tripe.py: tripe.py.in Makefile
-	$(confsubst) $(srcdir)/tripe.py.in >$@.new $(SUBSTITUTIONS) && \
+	$(SUBST) $(srcdir)/tripe.py.in >$@.new $(SUBSTITUTIONS) && \
 		mv $@.new $@
 
 ## Make sure the modules are compiled.
diff --git a/svc/Makefile.am b/svc/Makefile.am
index ffe74d0b..121df6df 100644
--- a/svc/Makefile.am
+++ b/svc/Makefile.am
@@ -48,7 +48,7 @@ CLEANFILES		+= connect.8
 EXTRA_DIST		+= connect.8.in
 
 connect: connect.in Makefile
-	$(confsubst) $(srcdir)/connect.in >$@.new $(SUBSTITUTIONS) && \
+	$(SUBST) $(srcdir)/connect.in >$@.new $(SUBSTITUTIONS) && \
 		chmod +x $@.new && mv $@.new $@
 
 ## Watch for peers arriving and disconnecting.
@@ -61,7 +61,7 @@ CLEANFILES		+= watch.8
 EXTRA_DIST		+= watch.8.in
 
 watch: watch.in Makefile
-	$(confsubst) $(srcdir)/watch.in >$@.new $(SUBSTITUTIONS) && \
+	$(SUBST) $(srcdir)/watch.in >$@.new $(SUBSTITUTIONS) && \
 		chmod +x $@.new && mv $@.new $@
 
 ## Watch D-Bus to keep track of external connectivity.
@@ -74,7 +74,7 @@ CLEANFILES		+= conntrack.8
 EXTRA_DIST		+= conntrack.8.in
 
 conntrack: conntrack.in Makefile
-	$(confsubst) $(srcdir)/conntrack.in >$@.new $(SUBSTITUTIONS) && \
+	$(SUBST) $(srcdir)/conntrack.in >$@.new $(SUBSTITUTIONS) && \
 		chmod +x $@.new && mv $@.new $@
 
 ## Bring up an interface.
@@ -87,7 +87,7 @@ CLEANFILES		+= tripe-ifup.8
 EXTRA_DIST		+= tripe-ifup.8.in
 
 tripe-ifup: tripe-ifup.in Makefile
-	$(confsubst) $(srcdir)/tripe-ifup.in >$@.new $(SUBSTITUTIONS) && \
+	$(SUBST) $(srcdir)/tripe-ifup.in >$@.new $(SUBSTITUTIONS) && \
 		chmod +x $@.new && mv $@.new $@
 
 ###----- That's all, folks --------------------------------------------------
diff --git a/vars.am b/vars.am
index d4cdafbd..5a9938d6 100644
--- a/vars.am
+++ b/vars.am
@@ -67,6 +67,11 @@ SUBSTITUTIONS = \
 		PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
 		PYTHON=$(PYTHON)
 
+V_SUBST = $(V_SUBST_$(V))
+V_SUBST_ = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
+V_SUBST_0 = @echo "  SUBST  $@";
+SUBST = $(V_SUBST)$(confsubst)
+
 ###--------------------------------------------------------------------------
 ### Manpage substitutions.
 
@@ -78,11 +83,17 @@ SUFFIXES		+= .8 .8.in
 mandefs = $(top_srcdir)/common/defs.man
 makesummary = $(top_srcdir)/common/make-summary
 
+V_MAN = $(V_MAN_$(V))
+V_MAN_ = $(V_MAN_$(AM_DEFAULT_VERBOSITY))
+V_MAN_0 = @echo "  MAN    $@";
+
 .1.in.1 .5.in.5 .7.in.7 .8.in.8:
-	sed '/^\.$$/ d; /^\.\\"/ d' $(mandefs) >$@.defs
-	sed -e '/@@@PRE@@@/ {' -e 'r$@.defs' -e 'd' -e '}' $< >$@.merge
-	$(confsubst) $@.merge >$@.subst $(SUBSTITUTIONS)
-	awk -f $(makesummary) $@.subst >$@.new
-	rm -f $@.defs $@.merge $@.subst && mv $@.new $@
+	$(V_MAN)
+	$(AM_V_at)sed '/^\.$$/ d; /^\.\\"/ d' $(mandefs) >$@.defs
+	$(AM_V_at)sed -e '/@@@PRE@@@/ {' -e 'r$@.defs' -e 'd' -e '}' \
+		$< >$@.merge
+	$(AM_V_at)$(confsubst) $@.merge >$@.subst $(SUBSTITUTIONS)
+	$(AM_V_at)awk -f $(makesummary) $@.subst >$@.new
+	$(AM_V_at)rm -f $@.defs $@.merge $@.subst && mv $@.new $@
 
 ###----- That's all, folks --------------------------------------------------