From e5760ee3f30b36e1ce866c68db759a40a2ecd8b0 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 28 Jul 2005 22:30:32 +0000
Subject: [PATCH] further refine output so the silent mode of make is truly
 silent

---
 Makefile                      | 42 ++++++++++++++++++++++++------------------
 Rules.mak                     | 11 +++++++++++
 extra/scripts/fix_includes.sh |  4 ++--
 libc/Makefile                 |  4 +++-
 4 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index 062f6fb38..25a8cb4e4 100644
--- a/Makefile
+++ b/Makefile
@@ -42,9 +42,9 @@ all: headers pregen subdirs shared finished
 
 shared: subdirs
 ifeq ($(strip $(HAVE_SHARED)),y)
-	@echo
-	@echo Building shared libraries ...
-	@echo
+	$(SECHO)
+	$(SECHO) Building shared libraries ...
+	$(SECHO)
 	@$(MAKE) -C libc shared
 	@$(MAKE) -C ldso shared
 	@$(MAKE) -C libcrypt shared
@@ -58,15 +58,15 @@ ifeq ($(strip $(UCLIBC_HAS_GETTEXT_AWARENESS)),y)
 	@$(MAKE) -C libintl shared
 endif
 else
-	@echo
-	@echo Not building shared libraries ...
-	@echo
+	$(SECHO)
+	$(SECHO) Not building shared libraries ...
+	$(SECHO)
 endif
 
 finished: shared
-	@echo
-	@echo Finally finished compiling ...
-	@echo
+	$(SECHO)
+	$(SECHO) Finally finished compiling ...
+	$(SECHO)
 
 include/bits/uClibc_config.h: .config
 	@if [ ! -x ./extra/config/conf ] ; then \
@@ -81,12 +81,16 @@ include/bits/uClibc_config.h: .config
 # in order to generate the headers correctly :(.  That 
 # means we can't use the $(HOSTCC) in order to get the 
 # correct output.
-headers: include/bits/uClibc_config.h
 ifeq ($(strip $(ARCH_HAS_MMU)),y)
-	@set -x; ./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH)
+export header_extra_args = 
 else
-	@set -x; ./extra/scripts/fix_includes.sh -k $(KERNEL_SOURCE) -t $(TARGET_ARCH) -n
+export header_extra_args = -n
 endif
+headers: include/bits/uClibc_config.h
+	@$(SHELL_SET_X); \
+	./extra/scripts/fix_includes.sh \
+		-k $(KERNEL_SOURCE) -t $(TARGET_ARCH) \
+		$(header_extra_args)
 	@cd include/bits; \
 	set -e; \
 	for i in `ls ../../libc/sysdeps/linux/common/bits/*.h` ; do \
@@ -108,7 +112,8 @@ endif
 		done; \
 	fi
 	@cd $(TOPDIR); \
-	set -x -e; \
+	set -e; \
+	$(SHELL_SET_X); \
 	TOPDIR=. CC="$(CC)" /bin/sh extra/scripts/gen_bits_syscall_h.sh > include/bits/sysnum.h.new; \
 	if cmp include/bits/sysnum.h include/bits/sysnum.h.new >/dev/null 2>&1; then \
 		$(RM) include/bits/sysnum.h.new; \
@@ -153,7 +158,7 @@ install_dev:
 	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib
 	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include
 	-$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/
-	tar -chf - include | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX);
+	tar -chf - include | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX)
 ifneq ($(strip $(UCLIBC_HAS_FLOATS)),y)
 	# Remove floating point related headers since float support is disabled.
 	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/complex.h
@@ -244,7 +249,8 @@ ifeq ($(strip $(HAVE_SHARED)),y)
 		$(PREFIX)$(RUNTIME_PREFIX)lib
 	cp -dRf lib/*.so.* $(PREFIX)$(RUNTIME_PREFIX)lib
 	@if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
-	    set -x -e; \
+	    set -e; \
+		$(SHELL_SET_X); \
 	    $(INSTALL) -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 	    		$(PREFIX)$(RUNTIME_PREFIX)lib; \
 	fi;
@@ -268,9 +274,9 @@ install_utils: utils
 #endif
 
 finished2:
-	@echo
-	@echo Finished installing ...
-	@echo
+	$(SECHO)
+	$(SECHO) Finished installing ...
+	$(SECHO)
 
 else # ifeq ($(strip $(HAVE_DOT_CONFIG)),y)
 
diff --git a/Rules.mak b/Rules.mak
index 762880eda..91dbec36c 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -94,6 +94,17 @@ check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1;
 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 ($(subst s,,$(MAKEFLAGS)),$(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
+
 # Make certain these contain a final "/", but no "//"s.
 TARGET_ARCH:=$(shell grep -s ^TARGET_ARCH $(TOPDIR)/.config | sed -e 's/^TARGET_ARCH=//' -e 's/"//g')
 RUNTIME_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(RUNTIME_PREFIX))))))
diff --git a/extra/scripts/fix_includes.sh b/extra/scripts/fix_includes.sh
index a57e4f253..910242fa5 100755
--- a/extra/scripts/fix_includes.sh
+++ b/extra/scripts/fix_includes.sh
@@ -100,13 +100,13 @@ then
     exit 1
 fi
 
+if [ "$MAKE_IS_SILENT" != "y" ]; then
 echo "Current kernel version is $VERSION.$PATCHLEVEL.$SUBLEVEL${EXTRAVERSION}"
-
-
 echo -e "\n"
 echo "Using kernel headers from $VERSION.$PATCHLEVEL.$SUBLEVEL${EXTRAVERSION} for architecture '$TARGET_ARCH'"
 echo -e "\tprovided in directory $KERNEL_SOURCE"
 echo -e "\n"
+fi
 
 # Create a symlink to include/asm
 
diff --git a/libc/Makefile b/libc/Makefile
index ba3cd503a..dcd51bb1b 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -62,7 +62,9 @@ $(LIBNAME) shared_$(LIBNAME) ar-target: subdirs
 	                obj.string.generic obj.string.$(TARGET_ARCH) obj.string \
 	                obj.sysdeps.common obj.sysdeps.$(TARGET_ARCH) ; do \
 		if [ -e $$objfile ] ; then \
-			echo $(AR) $(ARFLAGS) $(LIBNAME) $$objfile ; \
+			if [ "$(MAKE_IS_SILENT)" = "n" ] ; then \
+				echo $(AR) $(ARFLAGS) $(LIBNAME) $$objfile ; \
+			fi ; \
 			objs=`cat $$objfile` ; \
 		fi ; \
 		$(AR) $(ARFLAGS) $(LIBNAME) $$objs || exit 1 ; \
-- 
2.11.0