Commit a435600e authored Aug 10, 2010 by Ben Hutchings Committed by Linus Torvalds Aug 11, 2010

docbook: need xmldoclinks for all doc types



$ rm -rf build
$ mkdir build
$ cp .config build
$ make O=build htmldocs
...
xmlto: linux-2.6/build/Documentation/DocBook/media.xml
does not validate (status 3)
xmlto: Fix document syntax or use --skip-validation option
linux-2.6/build/Documentation/DocBook/media.xml:4:
warning: failed to load external entity
"linux-2.6/build/Documentation/DocBook/media-entities.tmpl"

We need the xmldoclinks built for any document types built from the
XML sources.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Acked-by: Andy Whitcroft <apw@canonical.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 79872e07

Documentation/DocBook/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)

		###