From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Mon, 20 Jan 2014 05:10:11 +0000 (+0900)
Subject: kbuild: docbook: specify KERNELDOC dependency correctly
X-Git-Tag: firefly_0821_release~176^2~4108^2~6
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=100da4c0150c97ce34d4d3b38bf2f5449b05ae4f;p=firefly-linux-kernel-4.4.55.git

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>
---

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
         ) > $(dir $@).$(notdir $@).cmd
 endef
 
-%.xml: %.tmpl FORCE
+%.xml: %.tmpl $(KERNELDOC) $(DOCPROC) FORCE
 	$(call if_changed_rule,docproc)
 
-###
-# Changes in kernel-doc force a rebuild of all documentation
-$(BOOKS): $(KERNELDOC)
-
 # Tell kbuild to always build the programs
 always := $(hostprogs-y)