From: Ben Hutchings <ben@decadent.org.uk>
To: Andy Whitcroft <apw@canonical.com>
Cc: Randy Dunlap <rdunlap@xenotime.net>,
linux-doc@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/1] docbook: need xmldoclinks for all doc types
Date: Mon, 14 Jun 2010 12:15:42 +0100 [thread overview]
Message-ID: <1276514142.14011.329.camel@localhost> (raw)
In-Reply-To: <1276513297-23306-1-git-send-email-apw@canonical.com>
[-- Attachment #1: Type: text/plain, Size: 1225 bytes --]
On Mon, 2010-06-14 at 12:01 +0100, Andy Whitcroft wrote:
> We need the xmldoclinks built for any document types built from the
> XML sources.
[...]
Yes, you're right, I don't know why I put xmldoclinks there. It Worked
For Me when building the linux-doc package in Debian.
However, the dependencies you're introducing seem to assume a serial
make. I think this (untested) change would get the dependencies right:
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 9d6f1a4..e9d75e6 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -35,7 +35,7 @@ PS_METHOD = $(prefer-db2x)
PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs xmldoclinks
BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
-xmldocs: $(BOOKS) xmldoclinks
+xmldocs: $(BOOKS)
sgmldocs: xmldocs
PS := $(patsubst %.xml, %.ps, $(BOOKS))
@@ -95,7 +95,7 @@ define rule_docproc
) > $(dir $@).$(notdir $@).cmd
endef
-%.xml: %.tmpl FORCE
+%.xml: %.tmpl xmldoclinks FORCE
$(call if_changed_rule,docproc)
###
--- END ---
Ben.
--
Ben Hutchings
Once a job is fouled up, anything done to improve it makes it worse.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
next prev parent reply other threads:[~2010-06-14 11:15 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-14 11:01 [PATCH 1/1] docbook: need xmldoclinks for all doc types Andy Whitcroft
2010-06-14 11:15 ` Ben Hutchings [this message]
2010-06-14 12:20 ` Andy Whitcroft
2010-06-15 0:55 ` [PATCH] " Ben Hutchings
2010-06-15 15:36 ` Randy Dunlap
2010-06-16 0:46 ` Ben Hutchings
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=1276514142.14011.329.camel@localhost \
--to=ben@decadent.org.uk \
--cc=akpm@linux-foundation.org \
--cc=apw@canonical.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rdunlap@xenotime.net \
/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