More build output cleaning up

diff --git a/Makefile b/Makefile
index 66ab992442299b810c6ebfb5936f0773a9bac39b..eb6c421acc9fcd3ac69905b83647bfb32bea3711 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # The default target of this Makefile is...
 all::
 
-# Define QUIET_MAKE to have a less verbose compile.
+# Define V=1 to have a more verbose compile.
 #
 # Define NO_OPENSSL environment variable if you do not have OpenSSL.
 # This also implies MOZILLA_SHA1.
@@ -604,15 +604,17 @@ endif
 ifdef NO_PERL_MAKEMAKER
        export NO_PERL_MAKEMAKER
 endif
-ifdef QUIET_MAKE
-       QUIET_CC       = @echo '   ' CC $<;
+ifndef V
+       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
-       export QUIET_MAKE
+       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 $@ $@+ && \