summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-03-06 02:09:14 -0500
committerJunio C Hamano <junkio@cox.net>2007-03-06 00:48:13 -0800
commit2314c947706b9480ddd8c1420efa8da523d99c9f (patch)
tree87448f09bbe2f85a14b2a72872779dcd813b46ab
parent74f2b2a8d006a49e1be7e30731c2f7365d2741d1 (diff)
downloadgit-2314c947706b9480ddd8c1420efa8da523d99c9f.tar.gz
Make 'make' quiet by default
Per Junio's suggestion we are setting 'make' to be quiet by default, with `make V=1` available to force GNU make back to its default behavior of showing each command it is running. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Makefile6
-rw-r--r--perl/Makefile2
-rw-r--r--templates/Makefile2
3 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 66ab992442..72d42917d9 100644
--- 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,7 +604,7 @@ endif
ifdef NO_PERL_MAKEMAKER
export NO_PERL_MAKEMAKER
endif
-ifdef QUIET_MAKE
+ifndef V
QUIET_CC = @echo ' ' CC $<;
QUIET_AR = @echo ' ' AR $@;
QUIET_LINK = @echo ' ' LINK $@;
@@ -612,7 +612,7 @@ ifdef QUIET_MAKE
QUIET_GEN = @echo ' ' GEN $@;
QUIET_SUBDIR0 = @subdir=
QUIET_SUBDIR1 = ;echo ' ' SUBDIR $$subdir; $(MAKE) -C$$subdir
- export QUIET_MAKE
+ export V
else
QUIET_SUBDIR0 = $(MAKE) -C
QUIET_SUBDIR1 =
diff --git a/perl/Makefile b/perl/Makefile
index 2fceff2791..17d004e5a0 100644
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -6,7 +6,7 @@ makfile:=perl.mak
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
prefix_SQ = $(subst ','\'',$(prefix))
-ifdef QUIET_MAKE
+ifndef V
QUIET = @
endif
diff --git a/templates/Makefile b/templates/Makefile
index 81bd86ccf3..b8352e731b 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -1,6 +1,6 @@
# make and install sample templates
-ifdef QUIET_MAKE
+ifndef V
QUIET = @
endif