From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Paul Smith" <psmith@gnu.org>,
"Alexander Kanavin" <alex.kanavin@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 2/4] Documentation/Makefile: avoid multiple patterns when generating one file
Date: Tue, 29 Nov 2022 15:09:15 +0100 [thread overview]
Message-ID: <patch-v2-2.4-e232f308e40-20221129T140159Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-v2-0.4-00000000000-20221129T140159Z-avarab@gmail.com>
From: Paul Smith <psmith@gnu.org>
A GNU make pattern rule with multiple targets has always meant that
a single invocation of the recipe will build all the targets.
However in older versions of GNU make a recipe that did not really
build all the targets would be tolerated.
Starting with GNU make 4.4 this behavior is deprecated and pattern
rules are expected to generate files to match all the patterns.
If not all targets are created then GNU make will not consider any
target up to date and will re-run the recipe when it is run again.
I.e. a command like:
make -C Documentation git-am.1
Will never be satisfied that "git-am.1" has been made, because we
didn't also make "git-am.5" and "git-am.7", as the warning it'll emit
indicates:
$ make -C Documentation git-am.1
[...]
XMLTO git-am.1
Makefile:355: warning: pattern recipe did not update peer target 'git-am.7'.
Makefile:355: warning: pattern recipe did not update peer target 'git-am.5'.
Modify Documentation/Makefile to split the man page-creating pattern
rule into a separate pattern rule for each pattern. This requires a
small amount of copy/pasting, but due to splitting out the "DOC_MANN"
in the preceding commit it's not too bad.
Reported-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Paul Smith <psmith@gnu.org>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
Documentation/Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index d239f6751f0..89929e3d60b 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -356,7 +356,11 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
$(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
$(DOC_MANN): manpage-base-url.xsl $(wildcard manpage*.xsl)
-%.1 %.5 %.7 : %.xml
+%.1 : %.xml
+ $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
+%.5 : %.xml
+ $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
+%.7 : %.xml
$(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
%.xml : %.txt $(ASCIIDOC_DEPS)
--
2.39.0.rc0.993.g0c499e58e3b
next prev parent reply other threads:[~2022-11-29 14:09 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-27 22:42 [PATCH 0/1] Avoid multiple patterns when recipes generate one file Paul Smith
2022-11-27 22:42 ` [PATCH 1/1] " Paul Smith
2022-11-28 13:08 ` Ævar Arnfjörð Bjarmason
2022-11-28 18:33 ` Paul Smith
2022-11-28 18:57 ` Ævar Arnfjörð Bjarmason
2022-11-29 14:09 ` [PATCH v2 0/4] Makefiles: GNU make 4.4 fixes Ævar Arnfjörð Bjarmason
2022-11-29 14:09 ` [PATCH v2 1/4] Documentation/Makefile: de-duplicate *.[157] dependency list Ævar Arnfjörð Bjarmason
2022-11-30 4:17 ` Junio C Hamano
2022-11-29 14:09 ` Ævar Arnfjörð Bjarmason [this message]
2022-11-30 4:18 ` [PATCH v2 2/4] Documentation/Makefile: avoid multiple patterns when generating one file Junio C Hamano
2022-11-29 14:09 ` [PATCH v2 3/4] Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4 Ævar Arnfjörð Bjarmason
2022-11-30 4:28 ` Junio C Hamano
2022-11-30 5:49 ` Paul Smith
2022-12-01 12:37 ` Ævar Arnfjörð Bjarmason
2022-11-29 14:09 ` [PATCH v2 4/4] Documentation/Makefile: narrow wildcard rules to our known files Ævar Arnfjörð Bjarmason
2022-11-30 1:27 ` [PATCH v2 0/4] Makefiles: GNU make 4.4 fixes Junio C Hamano
2022-11-30 8:23 ` [PATCH v3 0/1] " Ævar Arnfjörð Bjarmason
2022-11-30 8:23 ` [PATCH v3 1/1] Makefiles: change search through $(MAKEFLAGS) for GNU make 4.4 Ævar Arnfjörð Bjarmason
2022-11-30 16:29 ` Paul Smith
2022-11-30 22:23 ` Junio C Hamano
2022-12-06 7:48 ` Johannes Schindelin
2022-12-06 8:13 ` Ævar Arnfjörð Bjarmason
2022-12-06 9:13 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=patch-v2-2.4-e232f308e40-20221129T140159Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=alex.kanavin@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=psmith@gnu.org \
/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.
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 NNTP newsgroup(s).