[PATCH/committed] sim: enable silent rules in common builds

[Mike Frysinger via Gdb-patches <gdb-patches@sourceware.org>]

We only do the common code as automake simplifies the logic.
---
 sim/Makefile.in               | 30 +++++++++++++--------------
 sim/common/local.mk           |  6 +++---
 sim/configure                 | 39 +++++++++++++++++++++++++++++++++++
 sim/configure.ac              |  1 +
 sim/testsuite/common/local.mk | 24 ++++++++++-----------
 5 files changed, 70 insertions(+), 30 deletions(-)

diff --git a/sim/common/local.mk b/sim/common/local.mk
index 076335d0b427..fc1149789a3c 100644
--- a/sim/common/local.mk
+++ b/sim/common/local.mk
@@ -39,6 +39,6 @@ noinst_LIBRARIES += %D%/libcommon.a
 	%D%/version.c
 
 %D%/version.c: $(srcroot)/gdb/version.in $(srcroot)/bfd/version.h $(srcdir)/%D%/create-version.sh
-	$(SHELL) $(srcdir)/%D%/create-version.sh $(srcroot)/gdb $@.tmp
-	$(SHELL) $(srcroot)/move-if-change $@.tmp $@
-	touch $@
+	$(AM_V_GEN)$(SHELL) $(srcdir)/%D%/create-version.sh $(srcroot)/gdb $@.tmp
+	$(AM_V_at)$(SHELL) $(srcroot)/move-if-change $@.tmp $@
+	$(AM_V_at)touch $@
diff --git a/sim/configure.ac b/sim/configure.ac
index e7f3f535ef59..129e9421ec1d 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -19,6 +19,7 @@ SIM_AC_PLATFORM
 
 AM_MAINTAINER_MODE
 AM_INIT_AUTOMAKE
+AM_SILENT_RULES([yes])
 
 # If a cpu ever has more than one simulator to choose from, use
 # --enable-sim=... to choose.
diff --git a/sim/testsuite/common/local.mk b/sim/testsuite/common/local.mk
index 4db7981d1602..69f2d70eb5f4 100644
--- a/sim/testsuite/common/local.mk
+++ b/sim/testsuite/common/local.mk
@@ -49,33 +49,33 @@ check_PROGRAMS += $(TESTS)
 	$(AM_V_CCLD)$(LINK_FOR_BUILD) $(%C%_bits32m0_OBJECTS) $(%C%_bits32m0_LDADD)
 
 %D%/bits32m0.c: %D%/bits-gen %D%/bits-tst.c
-	$< 32 0 big > $@.tmp
-	cat $(srcdir)/%D%/bits-tst.c >> $@.tmp
-	mv $@.tmp $@
+	$(AM_V_GEN)$< 32 0 big > $@.tmp
+	$(AM_V_at)cat $(srcdir)/%D%/bits-tst.c >> $@.tmp
+	$(AM_V_at)mv $@.tmp $@
 
 %D%/bits32m31$(EXEEXT): $(%C%_bits32m31_OBJECTS) $(%C%_bits32m31_DEPENDENCIES) %D%/$(am__dirstamp)
 	$(AM_V_CCLD)$(LINK_FOR_BUILD) $(%C%_bits32m31_OBJECTS) $(%C%_bits32m31_LDADD)
 
 %D%/bits32m31.c: %D%/bits-gen %D%/bits-tst.c
-	$< 32 31 little > $@.tmp
-	cat $(srcdir)/%D%/bits-tst.c >> $@.tmp
-	mv $@.tmp $@
+	$(AM_V_GEN)$< 32 31 little > $@.tmp
+	$(AM_V_at)cat $(srcdir)/%D%/bits-tst.c >> $@.tmp
+	$(AM_V_at)mv $@.tmp $@
 
 %D%/bits64m0$(EXEEXT): $(%C%_bits64m0_OBJECTS) $(%C%_bits64m0_DEPENDENCIES) %D%/$(am__dirstamp)
 	$(AM_V_CCLD)$(LINK_FOR_BUILD) $(%C%_bits64m0_OBJECTS) $(%C%_bits64m0_LDADD)
 
 %D%/bits64m0.c: %D%/bits-gen %D%/bits-tst.c
-	$< 64 0 big > $@.tmp
-	cat $(srcdir)/%D%/bits-tst.c >> $@.tmp
-	mv $@.tmp $@
+	$(AM_V_GEN)$< 64 0 big > $@.tmp
+	$(AM_V_at)cat $(srcdir)/%D%/bits-tst.c >> $@.tmp
+	$(AM_V_at)mv $@.tmp $@
 
 %D%/bits64m63$(EXEEXT): $(%C%_bits64m63_OBJECTS) $(%C%_bits64m63_DEPENDENCIES) %D%/$(am__dirstamp)
 	$(AM_V_CCLD)$(LINK_FOR_BUILD) $(%C%_bits64m63_OBJECTS) $(%C%_bits64m63_LDADD)
 
 %D%/bits64m63.c: %D%/bits-gen %D%/bits-tst.c
-	$< 64 63 little > $@.tmp
-	cat $(srcdir)/%D%/bits-tst.c >> $@.tmp
-	mv $@.tmp $@
+	$(AM_V_GEN)$< 64 63 little > $@.tmp
+	$(AM_V_at)cat $(srcdir)/%D%/bits-tst.c >> $@.tmp
+	$(AM_V_at)mv $@.tmp $@
 
 CLEANFILES += \
 	%D%/bits-gen \
-- 
2.31.1