[PATCH] Support of "make -s": do not output anything of the build itself
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
Makefile | 10 +++++++---
git-gui/Makefile | 5 -----
2 files changed, 7 insertions(+), 8 deletions(-)
From d433ed1d682b64eb4a8ac1cb55bc568e0f0f10f0 Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Tue, 6 Mar 2007 23:57:55 +0100
Subject: [PATCH] Support of "make -s": do not output anything of the build itself
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
Makefile | 10 +++++++---
git-gui/Makefile | 5 -----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index eb6c421..983da60 100644
--- a/Makefile
+++ b/Makefile
@@ -604,6 +604,11 @@ endif
ifdef NO_PERL_MAKEMAKER
export NO_PERL_MAKEMAKER
endif
+
+QUIET_SUBDIR0 = $(MAKE) -C # space to separate -C and subdir
+QUIET_SUBDIR1 =
+
+ifneq ($(findstring $(MAKEFLAGS),s),s)
ifndef V
QUIET_CC = @echo ' ' CC $@;
QUIET_AR = @echo ' ' AR $@;
@@ -615,9 +620,8 @@ ifndef V
$(MAKE) --no-print-directory -C $$subdir
export V
export QUIET_GEN
-else
- QUIET_SUBDIR0 = $(MAKE) -C
- QUIET_SUBDIR1 =
+ export QUIET_BUILT_IN
+endif
endif
# Shell quote (do not use $(call) to accommodate ancient setups);
diff --git a/git-gui/Makefile b/git-gui/Makefile
index e486e8f..4f3fc74 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -22,11 +22,6 @@ ifndef INSTALL
INSTALL = install
endif
-ifndef V
- QUIET_GEN = @echo ' ' GEN $@;
- QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
-endif
-
DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
--
1.5.0.3.410.gca42
Alex Riesen <raa.lkml@gmail.com>