From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Phillip Wood" <phillip.wood123@gmail.com>,
"Jeff King" <peff@peff.net>, "Dan Jacques" <dnj@google.com>,
"Eric Wong" <e@80x24.org>, "Jonathan Nieder" <jrnieder@gmail.com>,
"Mike Hommey" <mh@glandium.org>,
"Đoàn Trần Công Danh" <congdanhqx@gmail.com>,
"Victoria Dye" <vdye@github.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 7/8] Makefile: use $(wspfx) for $(QUIET...) in shared.mak
Date: Fri, 17 Dec 2021 02:39:25 +0100 [thread overview]
Message-ID: <patch-7.8-3daef7672be-20211217T012902Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.8-00000000000-20211217T012902Z-avarab@gmail.com>
Change the mostly move-only change in the preceding commit to use the
$(wspfx) variable for defining the QUIET padding, to guarantee that
it's consistent with the "TRACK_template" template.
$ make CFLAGS=-I$RANDOM grep.o wspfx='$(space)->'
-> GIT-CFLAGS PARAMETERS (changed)
-> CC grep.o
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
shared.mak | 54 ++++++++++++++++++++++++++++++------------------------
1 file changed, 30 insertions(+), 24 deletions(-)
diff --git a/shared.mak b/shared.mak
index d6f70f3d6c9..f8ebaf30569 100644
--- a/shared.mak
+++ b/shared.mak
@@ -32,6 +32,12 @@ comma = ,
empty =
space = $(empty) $(empty)
+## wspfx: the whitespace prefix padding for $(QUIET...) and similarly
+## aligned output.
+wspfx = $(space)$(space)$(space)
+wspfx_SQ = '$(subst ','\'',$(wspfx))'
+# ' closing quote to appease Emacs make-mode.elxo
+
### Quieting
## common
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
@@ -47,39 +53,39 @@ ifneq ($(findstring s,$(MAKEFLAGS)),s)
ifndef V
## common
QUIET_SUBDIR0 = +@subdir=
- QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
+ QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo $(wspfx_SQ) SUBDIR $$subdir; \
$(MAKE) $(PRINT_DIR) -C $$subdir
QUIET = @
- QUIET_GEN = @echo ' ' GEN $@;
+ QUIET_GEN = @echo $(wspfx_SQ) 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 $<;
+ QUIET_CC = @echo $(wspfx_SQ) CC $@;
+ QUIET_AR = @echo $(wspfx_SQ) AR $@;
+ QUIET_LINK = @echo $(wspfx_SQ) LINK $@;
+ QUIET_BUILT_IN = @echo $(wspfx_SQ) BUILTIN $@;
+ QUIET_LNCP = @echo $(wspfx_SQ) LN/CP $@;
+ QUIET_XGETTEXT = @echo $(wspfx_SQ) XGETTEXT $@;
+ QUIET_MSGFMT = @echo $(wspfx_SQ) MSGFMT $@;
+ QUIET_GCOV = @echo $(wspfx_SQ) GCOV $@;
+ QUIET_SP = @echo $(wspfx_SQ) SP $<;
+ QUIET_HDR = @echo $(wspfx_SQ) HDR $(<:hcc=h);
+ QUIET_RC = @echo $(wspfx_SQ) RC $@;
+ QUIET_SPATCH = @echo $(wspfx_SQ) 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_ASCIIDOC = @echo $(wspfx_SQ) ASCIIDOC $@;
+ QUIET_XMLTO = @echo $(wspfx_SQ) XMLTO $@;
+ QUIET_DB2TEXI = @echo $(wspfx_SQ) DB2TEXI $@;
+ QUIET_MAKEINFO = @echo $(wspfx_SQ) MAKEINFO $@;
+ QUIET_DBLATEX = @echo $(wspfx_SQ) DBLATEX $@;
+ QUIET_XSLTPROC = @echo $(wspfx_SQ) XSLTPROC $@;
+ QUIET_GEN = @echo $(wspfx_SQ) 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 $<;
+ QUIET_LINT_GITLINK = @echo $(wspfx_SQ) LINT GITLINK $<;
+ QUIET_LINT_MANSEC = @echo $(wspfx_SQ) LINT MAN SEC $<;
+ QUIET_LINT_MANEND = @echo $(wspfx_SQ) LINT MAN END $<;
export V
endif
--
2.34.1.1119.g7a3fc8778ee
next prev parent reply other threads:[~2021-12-17 1:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-17 1:39 [PATCH 0/8] Makefile: optimize noop runs, add shared.mak Ævar Arnfjörð Bjarmason
2021-12-17 1:39 ` [PATCH 1/8] Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to it Ævar Arnfjörð Bjarmason
2021-12-17 1:39 ` [PATCH 2/8] Makefile: disable GNU make built-in wildcard rules Ævar Arnfjörð Bjarmason
2021-12-17 1:39 ` [PATCH 3/8] Makefile: define $(LIB_H) in terms of $(FIND_SOURCE_FILES) Ævar Arnfjörð Bjarmason
2021-12-17 1:39 ` [PATCH 4/8] Makefile: move ".SUFFIXES" rule to shared.mak Ævar Arnfjörð Bjarmason
2021-12-17 1:39 ` [PATCH 5/8] Makefile: move $(comma), $(empty) and $(space) " Ævar Arnfjörð Bjarmason
2021-12-17 1:39 ` [PATCH 6/8] Makefile: add "$(QUIET)" boilerplate " Ævar Arnfjörð Bjarmason
2021-12-17 1:39 ` Ævar Arnfjörð Bjarmason [this message]
2021-12-17 1:39 ` [PATCH 8/8] Makefiles: add and use wildcard "mkdir -p" template Ævar Arnfjörð Bjarmason
2021-12-17 6:09 ` Eric Sunshine
2021-12-24 17:41 ` Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=patch-7.8-3daef7672be-20211217T012902Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=congdanhqx@gmail.com \
--cc=dnj@google.com \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=mh@glandium.org \
--cc=peff@peff.net \
--cc=phillip.wood123@gmail.com \
--cc=vdye@github.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).