[PATCH] Support of "make -s": do not output anything of the build itself

[PATCH] Support of "make -s": do not output anything of the build itself

[Alex Riesen]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
 Makefile         |   10 +++++++---
 git-gui/Makefile |    5 -----
 2 files changed, 7 insertions(+), 8 deletions(-)

[-- Attachment #2: 0002-Support-of-make-s-do-not-output-anything-of-the.patch --]
[-- Type: text/x-patch, Size: 1504 bytes --]

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

Re: [PATCH] Support of "make -s": do not output anything of the build itself

[Shawn O. Pearce]

Alex Riesen <raa.lkml@gmail.com> wrote:
> Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
> ---
> Makefile         |   10 +++++++---
> git-gui/Makefile |    5 -----
> 2 files changed, 7 insertions(+), 8 deletions(-)

Nack.  You need to split any git-gui changes into their own patch
so that I can apply them to the git-gui repository directly.
Junio then merges that into git.git.

> +QUIET_SUBDIR0  = $(MAKE) -C # space to separate -C and subdir
> +QUIET_SUBDIR1  =
> +
> +ifneq ($(findstring $(MAKEFLAGS),s),s)

This is a good idea.

>  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

> diff --git a/git-gui/Makefile b/git-gui/Makefile
> -ifndef V
> -	QUIET_GEN      = @echo '   ' GEN $@;
> -	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
> -endif
> -

git-gui can be built on its own, outside of git.git's make system.
I need the ifneq(...-s...) thing above also here, around the
existing ifndef.

Want to rework the patch as two?  ;-)

-- 
Shawn.

Re: [PATCH] Support of "make -s": do not output anything of the build itself

[Alex Riesen]

This message will break the thread (which is short yet). Gmail again,
but I really want it to get to the list.

On 3/7/07, Shawn O. Pearce <spearce@spearce.org> wrote:
> Alex Riesen <raa.lkml@gmail.com> wrote:
> > Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
> > ---
> > Makefile         |   10 +++++++---
> > git-gui/Makefile |    5 -----
> > 2 files changed, 7 insertions(+), 8 deletions(-)
>
> Nack.  You need to split any git-gui changes into their own patch
> so that I can apply them to the git-gui repository directly.

Right. Sorry, I completely forgot about that. Will redo it.

> git-gui can be built on its own, outside of git.git's make system.
> I need the ifneq(...-s...) thing above also here, around the
> existing ifndef.
>
> Want to rework the patch as two?  ;-)

Will do.

P.S. I'm glad that someone can here me from here :)

Re: [PATCH] Support of "make -s": do not output anything of the build itself

[Alex Riesen]

On 3/7/07, Alex Riesen <raa.lkml@gmail.com> wrote:
>
> P.S. I'm glad that someone can here me from here :)
>

"Hear", of course. And it does not seem to work really...

[PATCH] Support of "make -s": do not output anything of the build itself

[Alex Riesen]

[-- Attachment #1: Type: text/plain, Size: 131 bytes --]

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>

---
 Makefile |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

[-- Attachment #2: 0003-Support-of-make-s-do-not-output-anything-of-the.patch --]
[-- Type: text/x-patch, Size: 994 bytes --]

From f741856c82aa840a198e3d751a1721b225b5b433 Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Wed, 7 Mar 2007 00:44:49 +0100
Subject: [PATCH] Support of "make -s": do not output anything of the build itself

---
 Makefile |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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);
-- 
1.5.0.3.430.g5573f