From: Harald Nordgren Date: Sun, 21 Jun 2026 14:56:42 +0000 (+0000) Subject: gitk: make "make -s" silent X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=6911df05387559350cf024d3e77d8a855f6213a3;p=thirdparty%2Fgit.git gitk: make "make -s" silent 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 Signed-off-by: Johannes Sixt --- diff --git a/Makefile b/Makefile index 41116d8a14..dd87f501e5 100644 --- a/Makefile +++ b/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