From: Andy Whitcroft <apw@canonical.com>
To: Ben Hutchings <ben@decadent.org.uk>
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 13:20:51 +0100 [thread overview]
Message-ID: <20100614122051.GW12061@shadowen.org> (raw)
In-Reply-To: <1276514142.14011.329.camel@localhost>
On Mon, Jun 14, 2010 at 12:15:42PM +0100, Ben Hutchings wrote:
> 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:
Bah, yeah and it just so happens that doc generation is occuring -j1.
> 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)
Seems to work here in my testing. Dependancy ordering wise it looks more
sensibl too. Will you be sending this version out or do you want me to
roll it.
Acked-by: Andy Whitcroft <apw@canonical.com>
-apw
next prev parent reply other threads:[~2010-06-14 12:20 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
2010-06-14 12:20 ` Andy Whitcroft [this message]
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=20100614122051.GW12061@shadowen.org \
--to=apw@canonical.com \
--cc=akpm@linux-foundation.org \
--cc=ben@decadent.org.uk \
--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