* [PATCH 1/2] kbuild: docbook: include cmd files more simply
@ 2014-01-20 5:10 Masahiro Yamada
2014-01-20 5:10 ` [PATCH 2/2] kbuild: docbook: specify KERNELDOC dependency correctly Masahiro Yamada
2014-03-14 17:10 ` [PATCH 1/2] kbuild: docbook: include cmd files more simply Michal Marek
0 siblings, 2 replies; 4+ messages in thread
From: Masahiro Yamada @ 2014-01-20 5:10 UTC (permalink / raw)
To: linux-kbuild; +Cc: Masahiro Yamada
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
Documentation/DocBook/Makefile | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 6ea50a3..237f6dc 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -36,6 +36,7 @@ PS_METHOD = $(prefer-db2x)
# The targets that may be used.
PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs
+targets += $(DOCBOOKS)
BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
xmldocs: $(BOOKS)
sgmldocs: xmldocs
@@ -90,14 +91,6 @@ endef
$(call if_changed_rule,docproc)
###
-#Read in all saved dependency files
-cmd_files := $(wildcard $(foreach f,$(BOOKS),$(dir $(f)).$(notdir $(f)).cmd))
-
-ifneq ($(cmd_files),)
- include $(cmd_files)
-endif
-
-###
# Changes in kernel-doc force a rebuild of all documentation
$(BOOKS): $(KERNELDOC)
--
1.8.3.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] kbuild: docbook: specify KERNELDOC dependency correctly
2014-01-20 5:10 [PATCH 1/2] kbuild: docbook: include cmd files more simply Masahiro Yamada
@ 2014-01-20 5:10 ` Masahiro Yamada
2014-03-14 17:11 ` Michal Marek
2014-03-14 17:10 ` [PATCH 1/2] kbuild: docbook: include cmd files more simply Michal Marek
1 sibling, 1 reply; 4+ messages in thread
From: Masahiro Yamada @ 2014-01-20 5:10 UTC (permalink / raw)
To: linux-kbuild; +Cc: Masahiro Yamada
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>
---
Documentation/DocBook/Makefile | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 237f6dc..824d26a 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -87,13 +87,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)
--
1.8.3.2
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 2/2] kbuild: docbook: specify KERNELDOC dependency correctly
2014-01-20 5:10 ` [PATCH 2/2] kbuild: docbook: specify KERNELDOC dependency correctly Masahiro Yamada
@ 2014-03-14 17:11 ` Michal Marek
0 siblings, 0 replies; 4+ messages in thread
From: Michal Marek @ 2014-03-14 17:11 UTC (permalink / raw)
To: Masahiro Yamada; +Cc: linux-kbuild, Randy Dunlap
On Mon, Jan 20, 2014 at 02:10:11PM +0900, Masahiro Yamada wrote:
> 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>
Applied to kbuild.git#kbuild, thanks.
Michal
> ---
> Documentation/DocBook/Makefile | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
> index 237f6dc..824d26a 100644
> --- a/Documentation/DocBook/Makefile
> +++ b/Documentation/DocBook/Makefile
> @@ -87,13 +87,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)
>
> --
> 1.8.3.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] kbuild: docbook: include cmd files more simply
2014-01-20 5:10 [PATCH 1/2] kbuild: docbook: include cmd files more simply Masahiro Yamada
2014-01-20 5:10 ` [PATCH 2/2] kbuild: docbook: specify KERNELDOC dependency correctly Masahiro Yamada
@ 2014-03-14 17:10 ` Michal Marek
1 sibling, 0 replies; 4+ messages in thread
From: Michal Marek @ 2014-03-14 17:10 UTC (permalink / raw)
To: Masahiro Yamada; +Cc: linux-kbuild, Randy Dunlap
On Mon, Jan 20, 2014 at 02:10:10PM +0900, Masahiro Yamada wrote:
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> ---
> Documentation/DocBook/Makefile | 9 +--------
> 1 file changed, 1 insertion(+), 8 deletions(-)
Applied to kbuild.git#kbuild, thanks.
Michal
>
> diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
> index 6ea50a3..237f6dc 100644
> --- a/Documentation/DocBook/Makefile
> +++ b/Documentation/DocBook/Makefile
> @@ -36,6 +36,7 @@ PS_METHOD = $(prefer-db2x)
> # The targets that may be used.
> PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs
>
> +targets += $(DOCBOOKS)
> BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
> xmldocs: $(BOOKS)
> sgmldocs: xmldocs
> @@ -90,14 +91,6 @@ endef
> $(call if_changed_rule,docproc)
>
> ###
> -#Read in all saved dependency files
> -cmd_files := $(wildcard $(foreach f,$(BOOKS),$(dir $(f)).$(notdir $(f)).cmd))
> -
> -ifneq ($(cmd_files),)
> - include $(cmd_files)
> -endif
> -
> -###
> # Changes in kernel-doc force a rebuild of all documentation
> $(BOOKS): $(KERNELDOC)
>
> --
> 1.8.3.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-14 17:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-20 5:10 [PATCH 1/2] kbuild: docbook: include cmd files more simply Masahiro Yamada
2014-01-20 5:10 ` [PATCH 2/2] kbuild: docbook: specify KERNELDOC dependency correctly Masahiro Yamada
2014-03-14 17:11 ` Michal Marek
2014-03-14 17:10 ` [PATCH 1/2] kbuild: docbook: include cmd files more simply Michal Marek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox