From: Alex Riesen Date: Tue, 6 Mar 2007 22:37:18 +0000 (+0100) Subject: More build output cleaning up X-Git-Tag: v1.5.1-rc1~66^2~2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=31d0399c;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index 72d42917d..eb6c421ac 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 17d004e5a..5ec038988 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