combine the output rules in one place

2 files changed, 7 insertions, 11 deletions

diff --git a/Makerules b/Makerules
index 429b6aa7f..47c0157ec 100644
--- a/Makerules
+++ b/Makerules
@@ -31,13 +31,20 @@ all_objs: $(ar_objs)
 endif
 
 headers-y: $(headers-y)
+	@true
 
 MAKEFLAGS += --no-print-directory
+SHELL_SET_X := set +x
 ifneq ($(findstring s,$(MAKEFLAGS)),)
+export MAKE_IS_SILENT := y
+SECHO := -@false
 DISP := sil
 Q := @
 else
+export MAKE_IS_SILENT := n
+SECHO := @echo
 ifneq ($(V)$(VERBOSE),)
+SHELL_SET_X := set -x
 DISP := ver
 Q := 
 else
diff --git a/Rules.mak b/Rules.mak
index 12eb92d68..212b43a2d 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -113,17 +113,6 @@ check_as=$(shell \
 	if $(CC) -Wa,$(1) -Wa,-Z -c -o /dev/null -xassembler /dev/null > /dev/null 2>&1; \
 	then echo "-Wa,$(1)"; fi)
 
-# Setup some shortcuts so that silent mode is silent like it should be
-ifeq ($(findstring s,$(MAKEFLAGS)),)
-export MAKE_IS_SILENT=n
-SECHO=@echo
-SHELL_SET_X=set -x
-else
-export MAKE_IS_SILENT=y
-SECHO=-@false
-SHELL_SET_X=set +x
-endif
-
 ARFLAGS:=cr
 
 OPTIMIZATION:=