From: Harald Nordgren via GitGitGadget Date: Sun, 21 Jun 2026 14:56:42 GMT Subject: [PATCH v3 1/2] gitk: make "make -s" silent Message-ID: <4d977d6f3fe716e8b3d5655b010fedbb8c9b8960.1782053803.git.gitgitgadget@gmail.com> In-Reply-To: From: Harald Nordgren The catalog rule runs msgfmt with --statistics, whose output goes to stderr and so survives "make -s", and the rule also echoes "Generating catalog". The Gitk Makefile guards its quiet helpers on V alone, so a silent build still prints these and the GEN line. The statistics are not needed, as in 2f12b31b746c (Makefile: don't invoke msgfmt with --statistics, 2021-12-17). Drop them, suppress the quiet helpers when "s" is among the make flags, and give the catalog rule a quiet prefix so a quiet build stays quiet. Signed-off-by: Harald Nordgren --- gitk-git/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gitk-git/Makefile b/gitk-git/Makefile index 41116d8a14..dd87f501e5 100644 --- a/gitk-git/Makefile +++ b/gitk-git/Makefile @@ -43,9 +43,12 @@ PO_TEMPLATE = po/gitk.pot ALL_POFILES = $(wildcard po/*.po) ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES)) +ifneq ($(findstring s,$(firstword -$(MAKEFLAGS))),s) ifndef V QUIET = @ QUIET_GEN = $(QUIET)echo ' ' GEN $@ && + QUIET_MSGFMT = $(QUIET)echo ' ' MSGFMT $@ && +endif endif all:: gitk-wish $(ALL_MSGFILES) @@ -75,8 +78,7 @@ update-po:: $(PO_TEMPLATE) echo; \ echo " git config filter.gettext-no-location.clean \"msgcat --no-location -\"" $(ALL_MSGFILES): %.msg : %.po - @echo Generating catalog $@ - $(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< + $(QUIET_MSGFMT)$(MSGFMT) --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< .PHONY: all install uninstall clean update-po .PHONY: FORCE -- gitgitgadget