summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2314c94)
raw | patch | inline | side by side (parent: 2314c94)
author | Alex Riesen <raa.lkml@gmail.com> | |
Tue, 6 Mar 2007 22:37:18 +0000 (23:37 +0100) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 7 Mar 2007 01:16:37 +0000 (17:16 -0800) |
- 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>
- 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>
Makefile | patch | blob | history | |
perl/Makefile | patch | blob | history |
diff --git a/Makefile b/Makefile
index 72d42917d92256bd12682b715012b7c5d8559c8e..eb6c421acc9fcd3ac69905b83647bfb32bea3711 100644 (file)
--- a/Makefile
+++ b/Makefile
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 =
$(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 17d004e5a0a19dc59b928a96a71d1470deb06e53..5ec0389883555c22cece5f9e3edf04c85c6282f1 100644 (file)
--- a/perl/Makefile
+++ b/perl/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