Re: [PATCH 1/1] docbook: need xmldoclinks for all doc types

From: Ben Hutchings
Date: Mon Jun 14 2010 - 07:15:58 EST


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: signature.asc
Description: This is a digitally signed message part