Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a435600e5b43238cfa84bc3d3e66fe02a10b3318

Authored by Ben Hutchings
Committed by Linus Torvalds
1 parent 79872e07ab
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

Documentation/DocBook/Makefile
Diff comments   View file @ a435600
... ... @@ -35,7 +35,7 @@
35 35 PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs xmldoclinks
36 36  
37 37 BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
38   -xmldocs: $(BOOKS) xmldoclinks
  38 +xmldocs: $(BOOKS)
39 39 sgmldocs: xmldocs
40 40  
41 41 PS := $(patsubst %.xml, %.ps, $(BOOKS))
... ... @@ -95,7 +95,7 @@
95 95 ) > $(dir $@).$(notdir $@).cmd
96 96 endef
97 97  
98   -%.xml: %.tmpl FORCE
  98 +%.xml: %.tmpl xmldoclinks FORCE
99 99 $(call if_changed_rule,docproc)
100 100  
101 101 ###