Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4

Since GNU make 4.4 the semantics of the $(MAKEFLAGS) variable has changed in a backward-incompatible way, as its "NEWS" file notes: Previously only simple (one-letter) options were added to the MAKEFLAGS variable that was visible while parsing makefiles. Now, all options are available in MAKEFLAGS. If you want to check MAKEFLAGS for a one-letter option, expanding "$(firstword -$(MAKEFLAGS))" is a reliable way to return the set of one-letter options which can be examined via findstring, etc. This upstream change meant that e.g.: make man Would become very noisy, because in shared.mak we rely on extracting "s" from the $(MAKEFLAGS), which now contains long options like "--jobserver-auth=fifo:<path>", which we'll conflate with the "-s" option. So, let's change this idiom we've been carrying since [1], [2] and [3] as the "NEWS" suggests. Note that the "-" in "-$(MAKEFLAGS)" is critical here, as the variable will always contain leading whitespace if there are no short options, but long options are present. Without it e.g. "make --debug=all" would yield "--debug=all" as the first word, but with it we'll get "-" as intended. Then "-s" for "-s", "-Bs" for "-s -B" etc. 1. 0c3b4aac8ec (git-gui: Support of "make -s" in: do not output anything of the build itself, 2007-03-07) 2. b777434383b (Support of "make -s": do not output anything of the build itself, 2007-03-07) 3. bb2300976ba (Documentation/Makefile: make most operations "quiet", 2009-03-27) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Nov 30, 2022 at 09:23 UTC 67b36879fc06581131fa7e57c9ee1e560ea9d1fc
2 files changed +3 -3
git-gui/Makefile
+1 -1
@@ -116,7 +116,7 @@ ifeq ($(uname_S),Darwin)
116 TKEXECUTABLE = $(shell basename "$(TKFRAMEWORK)" .app)
117 endif
118
119 -ifeq ($(findstring $(MAKEFLAGS),s),s)
119 +ifeq ($(findstring $(firstword -$(MAKEFLAGS)),s),s)
120 QUIET_GEN =
121 endif
122
shared.mak
+2 -2
@@ -37,13 +37,13 @@ space := $(empty) $(empty)
37 QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
38 QUIET_SUBDIR1 =
39
40 -ifneq ($(findstring w,$(MAKEFLAGS)),w)
40 +ifneq ($(findstring w,$(firstword -$(MAKEFLAGS))),w)
41 PRINT_DIR = --no-print-directory
42 else # "make -w"
43 NO_SUBDIR = :
44 endif
45
46 -ifneq ($(findstring s,$(MAKEFLAGS)),s)
46 +ifneq ($(findstring s,$(firstword -$(MAKEFLAGS))),s)
47 ifndef V
48 ## common
49 QUIET_SUBDIR0 = +@subdir=