aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Riesen <raa.lkml@gmail.com>2007-03-06 23:37:18 +0100
committerJunio C Hamano <junkio@cox.net>2007-03-06 17:16:37 -0800
commit31d0399c3c310d035cd7ed55c094f0b636ac5e20 (patch)
tree757870569c94571ea84ae038676cc98c93774f92
parent2314c947706b9480ddd8c1420efa8da523d99c9f (diff)
downloadgit-31d0399c3c310d035cd7ed55c094f0b636ac5e20.tar.gz
git-31d0399c3c310d035cd7ed55c094f0b636ac5e20.tar.xz
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> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Makefile8
-rw-r--r--perl/Makefile2
2 files changed, 6 insertions, 4 deletions
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