[PATCH] More build output cleaning up

[PATCH] More build output cleaning up

[Alex Riesen]

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

- print output file name for .c files
- suppress output of the names of subdirectories when make changes into them
- use GEN prefix for makefile generation in perl/

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
 Makefile      |    8 +++++---
 perl/Makefile |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

[-- Attachment #2: 0001-More-build-output-cleaning-up.patch --]
[-- Type: text/x-patch, Size: 2060 bytes --]

From 76d21c5a5a0dacfc09ed18f72b45c3f1fc174b0c Mon Sep 17 00:00:00 2001
From: Alex Riesen <raa.lkml@gmail.com>
Date: Tue, 6 Mar 2007 23:37:18 +0100
Subject: [PATCH] More build output cleaning up

- print output file name for .c files
- suppress output of the names of subdirectories when make changes into them
- use GEN prefix for makefile generation in perl/

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
---
 Makefile      |    8 +++++---
 perl/Makefile |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 72d4291..eb6c421 100644
--- a/Makefile
+++ b/Makefile
@@ -605,14 +605,16 @@ ifdef NO_PERL_MAKEMAKER
 	export NO_PERL_MAKEMAKER
 endif
 ifndef V
-	QUIET_CC       = @echo '   ' CC $<;
+	QUIET_CC       = @echo '   ' CC $@;
 	QUIET_AR       = @echo '   ' AR $@;
 	QUIET_LINK     = @echo '   ' LINK $@;
 	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
 	QUIET_GEN      = @echo '   ' GEN $@;
 	QUIET_SUBDIR0  = @subdir=
-	QUIET_SUBDIR1  = ;echo '   ' SUBDIR $$subdir; $(MAKE) -C$$subdir
+	QUIET_SUBDIR1  = ;echo '   ' SUBDIR $$subdir; \
+			 $(MAKE) --no-print-directory -C $$subdir
 	export V
+	export QUIET_GEN
 else
 	QUIET_SUBDIR0  = $(MAKE) -C
 	QUIET_SUBDIR1  =
@@ -685,7 +687,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
 $(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
 
 perl/perl.mak: GIT-CFLAGS
-	$(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
+	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
 
 $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
 	$(QUIET_GEN)rm -f $@ $@+ && \
diff --git a/perl/Makefile b/perl/Makefile
index 17d004e..5ec0389 100644
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -33,7 +33,7 @@ $(makfile): ../GIT-CFLAGS Makefile
 	echo '	echo $(instdir_SQ)' >> $@
 else
 $(makfile): Makefile.PL ../GIT-CFLAGS
-	'$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)'
+	$(QUIET_GEN)'$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)'
 endif
 
 # this is just added comfort for calling make directly in perl dir
-- 
1.5.0.3.410.gca42

Re: [PATCH] More build output cleaning up

[Alex Riesen]

Oh, damn... I did it again. Stupid gmail...
I'll try to resend them from my home account, but that
probably wont work (it never did). Vger (or whatever else)
keeps dropping them.

Re: [PATCH] More build output cleaning up

[Sergey Vlasov]

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

On Wed, 7 Mar 2007 00:13:08 +0100 Alex Riesen wrote:

> - print output file name for .c files
> - suppress output of the names of subdirectories when make changes into them
> - use GEN prefix for makefile generation in perl/
>
> Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
> ---
>  Makefile      |    8 +++++---
>  perl/Makefile |    2 +-
>  2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 72d4291..eb6c421 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -605,14 +605,16 @@ ifdef NO_PERL_MAKEMAKER
>  	export NO_PERL_MAKEMAKER
>  endif
>  ifndef V
> -	QUIET_CC       = @echo '   ' CC $<;
> +	QUIET_CC       = @echo '   ' CC $@;
>  	QUIET_AR       = @echo '   ' AR $@;
>  	QUIET_LINK     = @echo '   ' LINK $@;
>  	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
>  	QUIET_GEN      = @echo '   ' GEN $@;
>  	QUIET_SUBDIR0  = @subdir=
> -	QUIET_SUBDIR1  = ;echo '   ' SUBDIR $$subdir; $(MAKE) -C$$subdir
> +	QUIET_SUBDIR1  = ;echo '   ' SUBDIR $$subdir; \
> +			 $(MAKE) --no-print-directory -C $$subdir

Using --no-print-directory will break movement to the location of an
error/warning message at least in vim (emacs will probably have
problems too), if the error is in some file in a subdirectory.  The
problem is that the nested make will output paths relative to the
subdirectory, but without "Entering directory..." messages the editor
will not know that filenames should be interpreted relative to that
subdirectory.

Currently this problem is not visible, because subdirectories with
their own Makefiles (perl/ and git-gui/) do not contain C code - but
the problem will appear, e.g., if Git.xs will be added again.

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] More build output cleaning up

[Alex Riesen]

On 3/11/07, Sergey Vlasov <vsu@altlinux.ru> wrote:
>
> Using --no-print-directory will break movement to the location of an
> error/warning message at least in vim (emacs will probably have
> problems too), if the error is in some file in a subdirectory.  The

You can setup the make command-line to contain -w. It will work
for git and for any other project you may have.