aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-01-20 00:10:11 -0500
committerMichal Marek <mmarek@suse.cz>2014-03-14 13:06:47 -0400
commit100da4c0150c97ce34d4d3b38bf2f5449b05ae4f (patch)
treefeff16c98df6f21c978316b42f8dfebc415ea623 /Documentation
parent6f89b9c1d6b29eaa600ac4a8ac1314b0d06f15e3 (diff)
kbuild: docbook: specify KERNELDOC dependency correctly
It is not a good idea to describe %.xml: %.tmpl FORCE ... and $(BOOKS): $(KERNELDOC) separately. This cannot detect missing template files. For example, add something to DOCBOOKS variable: DOCBOOKS += foobar.xml and run make xmldocs It will succeed even if Documention/DocBook/foobar.tmpl does not exist. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/DocBook/Makefile6
1 files changed, 1 insertions, 5 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 105ba8e21777..89d9982ee667 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -88,13 +88,9 @@ define rule_docproc
88 ) > $(dir $@).$(notdir $@).cmd 88 ) > $(dir $@).$(notdir $@).cmd
89endef 89endef
90 90
91%.xml: %.tmpl FORCE 91%.xml: %.tmpl $(KERNELDOC) $(DOCPROC) FORCE
92 $(call if_changed_rule,docproc) 92 $(call if_changed_rule,docproc)
93 93
94###
95# Changes in kernel-doc force a rebuild of all documentation
96$(BOOKS): $(KERNELDOC)
97
98# Tell kbuild to always build the programs 94# Tell kbuild to always build the programs
99always := $(hostprogs-y) 95always := $(hostprogs-y)
100 96