linux-kernel - Re: [RFC PATCH 1/3] Documentation/sphinx: build the media intermediate rst files for all outputs

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160810131436.79ff53e1@vela.lan>
Date:	Wed, 10 Aug 2016 13:14:36 -0300
From:	Mauro Carvalho Chehab <mchehab@...radead.org>
To:	Jani Nikula <jani.nikula@...el.com>
Cc:	"Luis R. Rodriguez" <mcgrof@...nel.org>, linux-doc@...r.kernel.org,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Mauro Carvalho Chehab <mchehab@....samsung.com>,
	Daniel Vetter <daniel.vetter@...ll.ch>,
	Jonathan Corbet <corbet@....net>,
	Markus Heiser <markus.heiser@...marit.de>
Subject: Re: [RFC PATCH 1/3] Documentation/sphinx: build the media
 intermediate rst files for all outputs

Em Wed, 10 Aug 2016 18:54:07 +0300
Jani Nikula <jani.nikula@...el.com> escreveu:

> This is a stopgap measure to allow building outputs other than html.

Didn't test, but looking at the patch, it looks OK.

So,

Acked-by: Mauro Carvalho Chehab <mchehab@...pensource.com>

> 
> Signed-off-by: Jani Nikula <jani.nikula@...el.com>
> ---
>  Documentation/Makefile.sphinx | 3 +--
>  Documentation/media/Makefile  | 3 ++-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
> index 857f1e273418..d24a9f12a280 100644
> --- a/Documentation/Makefile.sphinx
> +++ b/Documentation/Makefile.sphinx
> @@ -38,10 +38,9 @@ ALLSPHINXOPTS   = -D version=$(KERNELVERSION) -D release=$(KERNELRELEASE) -d $(B
>  I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
>  
>  quiet_cmd_sphinx = SPHINX  $@
> -      cmd_sphinx = BUILDDIR=$(BUILDDIR) $(SPHINXBUILD) -b $2 $(ALLSPHINXOPTS) $(BUILDDIR)/$2
> +      cmd_sphinx = $(MAKE) BUILDDIR=$(BUILDDIR) $(build)=Documentation/media all; BUILDDIR=$(BUILDDIR) $(SPHINXBUILD) -b $2 $(ALLSPHINXOPTS) $(BUILDDIR)/$2
>  
>  htmldocs:
> -	$(MAKE) BUILDDIR=$(BUILDDIR) -f $(srctree)/Documentation/media/Makefile $@
>  	$(call cmd,sphinx,html)
>  
>  pdfdocs:
> diff --git a/Documentation/media/Makefile b/Documentation/media/Makefile
> index 39e2d766dbe3..a7fb35291f6c 100644
> --- a/Documentation/media/Makefile
> +++ b/Documentation/media/Makefile
> @@ -10,7 +10,8 @@ FILES = audio.h.rst ca.h.rst dmx.h.rst frontend.h.rst net.h.rst video.h.rst \
>  
>  TARGETS := $(addprefix $(BUILDDIR)/, $(FILES))
>  
> -htmldocs: $(BUILDDIR) ${TARGETS}
> +.PHONY: all
> +all: $(BUILDDIR) ${TARGETS}
>  
>  $(BUILDDIR):
>  	$(Q)mkdir -p $@




Cheers,
Mauro