Messages in this thread | | | Date | Wed, 10 Aug 2016 13:14:36 -0300 | From | Mauro Carvalho Chehab <> | 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@intel.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@s-opensource.com>
> > Signed-off-by: Jani Nikula <jani.nikula@intel.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
| |