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>
Alex Riesen committed
Mar 6, 2007 at 23:37 UTC
31d0399c3c310d035cd7ed55c094f0b636ac5e20
2 files changed
+6
-4
Makefile
+5
-3
@@ -605,14 +605,16 @@ ifdef NO_PERL_MAKEMAKER
605
export NO_PERL_MAKEMAKER
606
endif
607
ifndef V
608
- QUIET_CC = @echo ' ' CC $<;
608
+ QUIET_CC = @echo ' ' CC $@;
609
QUIET_AR = @echo ' ' AR $@;
610
QUIET_LINK = @echo ' ' LINK $@;
611
QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
612
QUIET_GEN = @echo ' ' GEN $@;
613
QUIET_SUBDIR0 = @subdir=
614
- QUIET_SUBDIR1 = ;echo ' ' SUBDIR $$subdir; $(MAKE) -C$$subdir
614
+ QUIET_SUBDIR1 = ;echo ' ' SUBDIR $$subdir; \
615
+ $(MAKE) --no-print-directory -C $$subdir
616
export V
617
+ export QUIET_GEN
618
else
619
QUIET_SUBDIR0 = $(MAKE) -C
620
QUIET_SUBDIR1 =
@@ -685,7 +687,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
687
$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
688
689
perl/perl.mak: GIT-CFLAGS
688
- $(MAKE) -C perl PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
690
+ $(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
691
692
$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
693
$(QUIET_GEN)rm -f $@ $@+ && \
perl/Makefile
+1
-1
@@ -33,7 +33,7 @@ $(makfile): ../GIT-CFLAGS Makefile
33
echo ' echo $(instdir_SQ)' >> $@
34
else
35
$(makfile): Makefile.PL ../GIT-CFLAGS
36
- '$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)'
36
+ $(QUIET_GEN)'$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)'
37
endif
38
39
# this is just added comfort for calling make directly in perl dir