--- v2
+++ v1
@@ -1,201 +1,47 @@
-The $(QUIET) variables we define are largely duplicated between our
-various Makefiles, let's define them in the new "shared.mak" instead.
+Remove the --statistics flag that I added in 5e9637c6297 (i18n: add
+infrastructure for translating Git with gettext, 2011-11-18). Our
+Makefile output is good about reducing verbosity by default, except in
+this case:
-Since we're not using the environment to pass these around we don't
-need to export the "QUIET_GEN" and "QUIET_BUILT_IN" variables
-anymore. The "QUIET_GEN" variable is used in "git-gui/Makefile" and
-"gitweb/Makefile", but they've got their own definition for those. The
-"QUIET_BUILT_IN" variable is only used in the top-level "Makefile". We
-still need to export the "V" variable.
+ $ rm -rf po/build/locale/e*; time make -j $(nproc) all
+ SUBDIR templates
+ MKDIR -p po/build/locale/el/LC_MESSAGES
+ MSGFMT po/build/locale/el/LC_MESSAGES/git.mo
+ MKDIR -p po/build/locale/es/LC_MESSAGES
+ MSGFMT po/build/locale/es/LC_MESSAGES/git.mo
+ 1038 translated messages, 3325 untranslated messages.
+ 5230 translated messages.
+
+I didn't have any good reason for using --statistics at the time other
+than ad-hoc eyeballing of the output. We don't need to spew out
+exactly how many messages we've got translated every time. Now we'll
+instead emit:
+
+ $ rm -rf po/build/locale/e*; time make -j $(nproc) all
+ SUBDIR templates
+ MKDIR -p po/build/locale/el/LC_MESSAGES
+ MSGFMT po/build/locale/el/LC_MESSAGES/git.mo
+ MKDIR -p po/build/locale/es/LC_MESSAGES
+ MSGFMT po/build/locale/es/LC_MESSAGES/git.mo
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
- Documentation/Makefile | 32 -------------------------
- Makefile | 33 --------------------------
- config.mak.uname | 1 -
- shared.mak | 53 ++++++++++++++++++++++++++++++++++++++++++
- templates/Makefile | 5 ----
- 5 files changed, 53 insertions(+), 71 deletions(-)
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/Documentation/Makefile b/Documentation/Makefile
-index 4a939cc2c25..69a9af35397 100644
---- a/Documentation/Makefile
-+++ b/Documentation/Makefile
-@@ -218,38 +218,6 @@ DEFAULT_EDITOR_SQ = $(subst ','\'',$(DEFAULT_EDITOR))
- ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)'
+diff --git a/Makefile b/Makefile
+index 141a87371fe..51b9e4b6c84 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1869,7 +1869,7 @@ ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT
endif
--QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
--QUIET_SUBDIR1 =
--
--ifneq ($(findstring $(MAKEFLAGS),w),w)
--PRINT_DIR = --no-print-directory
--else # "make -w"
--NO_SUBDIR = :
--endif
--
--ifneq ($(findstring $(MAKEFLAGS),s),s)
--ifndef V
-- QUIET = @
-- QUIET_ASCIIDOC = @echo ' ' ASCIIDOC $@;
-- QUIET_XMLTO = @echo ' ' XMLTO $@;
-- QUIET_DB2TEXI = @echo ' ' DB2TEXI $@;
-- QUIET_MAKEINFO = @echo ' ' MAKEINFO $@;
-- QUIET_DBLATEX = @echo ' ' DBLATEX $@;
-- QUIET_XSLTPROC = @echo ' ' XSLTPROC $@;
-- QUIET_GEN = @echo ' ' GEN $@;
-- QUIET_STDERR = 2> /dev/null
-- QUIET_SUBDIR0 = +@subdir=
-- QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
-- $(MAKE) $(PRINT_DIR) -C $$subdir
--
-- QUIET_LINT_GITLINK = @echo ' ' LINT GITLINK $<;
-- QUIET_LINT_MANSEC = @echo ' ' LINT MAN SEC $<;
-- QUIET_LINT_MANEND = @echo ' ' LINT MAN END $<;
--
-- export V
--endif
--endif
--
- all: html man
-
- html: $(DOC_HTML)
-diff --git a/Makefile b/Makefile
-index c8a0a1586ca..c437aea9e4a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1939,39 +1939,6 @@ ifndef PAGER_ENV
- PAGER_ENV = LESS=FRX LV=-c
+ ifndef NO_MSGFMT_EXTENDED_OPTIONS
+- MSGFMT += --check --statistics
++ MSGFMT += --check
endif
--QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
--QUIET_SUBDIR1 =
--
--ifneq ($(findstring w,$(MAKEFLAGS)),w)
--PRINT_DIR = --no-print-directory
--else # "make -w"
--NO_SUBDIR = :
--endif
--
--ifneq ($(findstring s,$(MAKEFLAGS)),s)
--ifndef V
-- QUIET_CC = @echo ' ' CC $@;
-- QUIET_AR = @echo ' ' AR $@;
-- QUIET_LINK = @echo ' ' LINK $@;
-- QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
-- QUIET_GEN = @echo ' ' GEN $@;
-- QUIET_LNCP = @echo ' ' LN/CP $@;
-- QUIET_XGETTEXT = @echo ' ' XGETTEXT $@;
-- QUIET_MSGFMT = @echo ' ' MSGFMT $@;
-- QUIET_GCOV = @echo ' ' GCOV $@;
-- QUIET_SP = @echo ' ' SP $<;
-- QUIET_HDR = @echo ' ' HDR $(<:hcc=h);
-- QUIET_RC = @echo ' ' RC $@;
-- QUIET_SPATCH = @echo ' ' SPATCH $<;
-- QUIET_SUBDIR0 = +@subdir=
-- QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
-- $(MAKE) $(PRINT_DIR) -C $$subdir
-- export V
-- export QUIET_GEN
-- export QUIET_BUILT_IN
--endif
--endif
--
- ifdef NO_INSTALL_HARDLINKS
- export NO_INSTALL_HARDLINKS
- endif
-diff --git a/config.mak.uname b/config.mak.uname
-index d0701f9beb0..1a12d8c635f 100644
---- a/config.mak.uname
-+++ b/config.mak.uname
-@@ -715,7 +715,6 @@ vcxproj:
- git diff-index --cached --quiet HEAD --
-
- # Make .vcxproj files and add them
-- unset QUIET_GEN QUIET_BUILT_IN; \
- perl contrib/buildsystems/generate -g Vcxproj
- git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj
-
-diff --git a/shared.mak b/shared.mak
-index 3b4163e652a..80176f705fc 100644
---- a/shared.mak
-+++ b/shared.mak
-@@ -35,6 +35,59 @@ space = $(empty) $(empty)
- wspfx = $(space)$(space)$(space)
- wspfx_sq = $(call shellquote,$(wspfx))
-
-+### Quieting
-+## common
-+QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
-+QUIET_SUBDIR1 =
-+
-+ifneq ($(findstring w,$(MAKEFLAGS)),w)
-+PRINT_DIR = --no-print-directory
-+else # "make -w"
-+NO_SUBDIR = :
-+endif
-+
-+ifneq ($(findstring s,$(MAKEFLAGS)),s)
-+ifndef V
-+## common
-+ QUIET_SUBDIR0 = +@subdir=
-+ QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
-+ $(MAKE) $(PRINT_DIR) -C $$subdir
-+
-+ QUIET = @
-+ QUIET_GEN = @echo ' ' GEN $@;
-+
-+## Used in "Makefile"
-+ QUIET_CC = @echo ' ' CC $@;
-+ QUIET_AR = @echo ' ' AR $@;
-+ QUIET_LINK = @echo ' ' LINK $@;
-+ QUIET_BUILT_IN = @echo ' ' BUILTIN $@;
-+ QUIET_LNCP = @echo ' ' LN/CP $@;
-+ QUIET_XGETTEXT = @echo ' ' XGETTEXT $@;
-+ QUIET_MSGFMT = @echo ' ' MSGFMT $@;
-+ QUIET_GCOV = @echo ' ' GCOV $@;
-+ QUIET_SP = @echo ' ' SP $<;
-+ QUIET_HDR = @echo ' ' HDR $(<:hcc=h);
-+ QUIET_RC = @echo ' ' RC $@;
-+ QUIET_SPATCH = @echo ' ' SPATCH $<;
-+
-+## Used in "Documentation/Makefile"
-+ QUIET_ASCIIDOC = @echo ' ' ASCIIDOC $@;
-+ QUIET_XMLTO = @echo ' ' XMLTO $@;
-+ QUIET_DB2TEXI = @echo ' ' DB2TEXI $@;
-+ QUIET_MAKEINFO = @echo ' ' MAKEINFO $@;
-+ QUIET_DBLATEX = @echo ' ' DBLATEX $@;
-+ QUIET_XSLTPROC = @echo ' ' XSLTPROC $@;
-+ QUIET_GEN = @echo ' ' GEN $@;
-+ QUIET_STDERR = 2> /dev/null
-+
-+ QUIET_LINT_GITLINK = @echo ' ' LINT GITLINK $<;
-+ QUIET_LINT_MANSEC = @echo ' ' LINT MAN SEC $<;
-+ QUIET_LINT_MANEND = @echo ' ' LINT MAN END $<;
-+
-+ export V
-+endif
-+endif
-+
- ### Templates
-
- ## Template for making a GIT-SOMETHING, which changes if a
-diff --git a/templates/Makefile b/templates/Makefile
-index c9251a96622..b056e710b7e 100644
---- a/templates/Makefile
-+++ b/templates/Makefile
-@@ -2,11 +2,6 @@
- include ../shared.mak
-
- # make and install sample templates
--
--ifndef V
-- QUIET = @
--endif
--
- INSTALL ?= install
- TAR ?= tar
- RM ?= rm -f
+ ifdef HAVE_CLOCK_GETTIME
--
-2.34.0.rc2.795.g926201d1cc8
+2.34.0.rc1.741.gab7bfd97031