mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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>
This commit is contained in:
parent
2314c94770
commit
31d0399c3c
8
Makefile
8
Makefile
|
@ -605,14 +605,16 @@ ifdef NO_PERL_MAKEMAKER
|
||||||
export NO_PERL_MAKEMAKER
|
export NO_PERL_MAKEMAKER
|
||||||
endif
|
endif
|
||||||
ifndef V
|
ifndef V
|
||||||
QUIET_CC = @echo ' ' CC $<;
|
QUIET_CC = @echo ' ' CC $@;
|
||||||
QUIET_AR = @echo ' ' AR $@;
|
QUIET_AR = @echo ' ' AR $@;
|
||||||
QUIET_LINK = @echo ' ' LINK $@;
|
QUIET_LINK = @echo ' ' LINK $@;
|
||||||
QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
|
QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
|
||||||
QUIET_GEN = @echo ' ' GEN $@;
|
QUIET_GEN = @echo ' ' GEN $@;
|
||||||
QUIET_SUBDIR0 = @subdir=
|
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 V
|
||||||
|
export QUIET_GEN
|
||||||
else
|
else
|
||||||
QUIET_SUBDIR0 = $(MAKE) -C
|
QUIET_SUBDIR0 = $(MAKE) -C
|
||||||
QUIET_SUBDIR1 =
|
QUIET_SUBDIR1 =
|
||||||
|
@ -685,7 +687,7 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
|
||||||
$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
|
$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
|
||||||
|
|
||||||
perl/perl.mak: GIT-CFLAGS
|
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
|
$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
|
||||||
$(QUIET_GEN)rm -f $@ $@+ && \
|
$(QUIET_GEN)rm -f $@ $@+ && \
|
||||||
|
|
|
@ -33,7 +33,7 @@ $(makfile): ../GIT-CFLAGS Makefile
|
||||||
echo ' echo $(instdir_SQ)' >> $@
|
echo ' echo $(instdir_SQ)' >> $@
|
||||||
else
|
else
|
||||||
$(makfile): Makefile.PL ../GIT-CFLAGS
|
$(makfile): Makefile.PL ../GIT-CFLAGS
|
||||||
'$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)'
|
$(QUIET_GEN)'$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# this is just added comfort for calling make directly in perl dir
|
# this is just added comfort for calling make directly in perl dir
|
||||||
|
|
Loading…
Reference in a new issue