From d1f814a1e310b5c1e6b32d5bdbf7b7450c221325 Mon Sep 17 00:00:00 2001
From: Jeremy Kerr <jk@ozlabs.org>
Date: Fri, 1 Aug 2014 12:32:31 +0800
Subject: automake: silence make output

Currently, we get a lot of noise out of the build process; automake
supports V={0,1}, which we can use to suppress the output a little.

This needs a few cleanups for custom commands.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---
 test/parser/Makefile.am | 4 ++--
 test/urls/Makefile.am   | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/test/parser/Makefile.am b/test/parser/Makefile.am
index 685d7ac..7541149 100644
--- a/test/parser/Makefile.am
+++ b/test/parser/Makefile.am
@@ -81,7 +81,7 @@ $(parser_TESTS): %: %.embedded-config.o test/parser/libtest.ro
 extract_config = $(srcdir)/test/parser/extract-config.awk
 
 %.embedded-config.c: %.c $(extract_config)
-	$(AWK) -f $(extract_config) $< > $@
+	$(AM_V_GEN)$(AWK) -f $(extract_config) $< > $@
 
 # objects under test
 
@@ -112,7 +112,7 @@ test_parser_libtest_ro_CPPFLAGS = \
 
 test/parser/libtest.ro$(EXEEXT): $(test_parser_libtest_ro_OBJECTS) \
 					   $(test_parser_libtest_ro_LDADD)
-	$(LD) -o $@ -r $^
+	$(AM_V_GEN)$(LD) -o $@ -r $^
 
 EXTRA_DIST += $(check_DATA) $(extract_config)
 
diff --git a/test/urls/Makefile.am b/test/urls/Makefile.am
index 47040ae..ad670b8 100644
--- a/test/urls/Makefile.am
+++ b/test/urls/Makefile.am
@@ -45,10 +45,9 @@ edit = sed \
 EXTRA_DIST += $(url_TESTS) test/urls/run-url-test.in
 
 test/urls/run-url-test: $(srcdir)/test/urls/run-url-test.in
-	rm -f $@ $@.tmp
-	$(edit) $(srcdir)/$@.in >$@.tmp
-	chmod +x $@.tmp
-	mv $@.tmp $@
+	$(AM_V_GEN)$(edit) $(srcdir)/$@.in > $@.tmp && \
+		chmod +x $@.tmp && \
+		mv $@.tmp $@
 
 CLEANFILES += test/urls/run-url-test
 
-- 
cgit v1.1