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: [PATCH] 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>
---
 configure.ac               | 2 ++
 discover/grub2/Makefile.am | 7 ++-----
 test/parser/Makefile.am    | 4 ++--
 test/urls/Makefile.am      | 7 +++----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9511fef..b540819 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,8 @@ AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.18.1)
 LT_INIT
 
+AM_SILENT_RULES([yes])
+
 AX_WITH_CURSES
 AX_WITH_CURSES_MENU
 AX_WITH_CURSES_FORM
diff --git a/discover/grub2/Makefile.am b/discover/grub2/Makefile.am
index dda6835..0bff9fa 100644
--- a/discover/grub2/Makefile.am
+++ b/discover/grub2/Makefile.am
@@ -14,10 +14,6 @@
 
 noinst_PROGRAMS += discover/grub2/grub2-parser.ro
 
-discover/grub2/grub2-parser.ro$(EXEEXT): \
-		$(discover_grub2_grub2_parser_ro_OBJECTS)
-	$(LD) -r -o $@ $^
-
 discover_grub2_grub2_parser_ro_SOURCES = \
 	discover/grub2/builtins.c \
 	discover/grub2/env.c \
@@ -39,12 +35,13 @@ CLEANFILES += \
 	discover/grub2/lexer.c \
 	discover/grub2/lexer.h
 
-
 discover_grub2_grub2_parser_ro_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	-I$(top_srcdir)/discover/grub2 \
 	-I$(top_builddir)/discover/grub2
 
+discover_grub2_grub2_parser_ro_LINK = \
+	$(LD) -r -o $@
 
 # ylwrap doesn't handle flex header files well; use our own rule here.
 discover/grub2/lexer.h discover/grub2/lexer.c: \
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
 
-- 
2.39.2