Skip to content

Commit 31d0399

Browse files
raalkmlJunio C Hamano
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2314c94 commit 31d0399

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -605,14 +605,16 @@ ifdef NO_PERL_MAKEMAKER
605605
export NO_PERL_MAKEMAKER
606606
endif
607607
ifndef V
608-
QUIET_CC = @echo ' ' CC $<;
608+
QUIET_CC = @echo ' ' CC $@;
609609
QUIET_AR = @echo ' ' AR $@;
610610
QUIET_LINK = @echo ' ' LINK $@;
611611
QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
612612
QUIET_GEN = @echo ' ' GEN $@;
613613
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
615616
export V
617+
export QUIET_GEN
616618
else
617619
QUIET_SUBDIR0 = $(MAKE) -C
618620
QUIET_SUBDIR1 =
@@ -685,7 +687,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
685687
$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
686688

687689
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)
689691

690692
$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
691693
$(QUIET_GEN)rm -f $@ $@+ && \

perl/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ $(makfile): ../GIT-CFLAGS Makefile
3333
echo ' echo $(instdir_SQ)' >> $@
3434
else
3535
$(makfile): Makefile.PL ../GIT-CFLAGS
36-
'$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)'
36+
$(QUIET_GEN)'$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)'
3737
endif
3838

3939
# this is just added comfort for calling make directly in perl dir

0 commit comments

Comments
 (0)