[FFmpeg-devel] [PATCH] doc: enable compilation of monolithic tools doc with --enable-monolithic-tools-doc

[Stefano Sabatini]

On date Tuesday 2013-03-19 18:45:28 -0300, James Almer encoded:
> On 19/03/13 6:25 PM, Stefano Sabatini wrote:
> > Fix trac issue #2374.
> > ---
> >  Makefile                |    2 +-
> >  configure               |    8 +++++++-
> >  doc/all-components.texi |   10 ++++++++++
> >  doc/ffmpeg.texi         |    5 +++++
> >  doc/ffplay.texi         |    5 +++++
> >  doc/ffprobe.texi        |    5 +++++
> >  doc/ffserver.texi       |    5 +++++
> >  7 files changed, 38 insertions(+), 2 deletions(-)
> >  create mode 100644 doc/all-components.texi
> > 
> > diff --git a/Makefile b/Makefile
> > index 07821d1..8155062 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -159,7 +159,7 @@ clean::
> >  
> >  distclean::
> >  	$(RM) $(DISTCLEANSUFFIXES)
> > -	$(RM) config.* .version version.h libavutil/avconfig.h libavcodec/codec_names.h
> > +	$(RM) config.* doc/config.texi .version version.h libavutil/avconfig.h libavcodec/codec_names.h
> 
> I think this should be in doc/Makefile instead, next to doc/avoptions_*.texi
> 
> >  
> >  config:
> >  	$(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)
> > diff --git a/configure b/configure
> > index 8443db4..1080965 100755
> > --- a/configure
> > +++ b/configure
> > @@ -116,6 +116,7 @@ Documentation options:
> >    --disable-manpages       do not build man documentation pages
> >    --disable-podpages       do not build POD documentation pages
> >    --disable-txtpages       do not build text documentation pages
> > +  --enable-monolithic-tools-doc build monolithic tools documentation pages
> >  
> >  Component options:
> >    --disable-avdevice       disable libavdevice build
> > @@ -1187,6 +1188,7 @@ DOCUMENT_LIST="
> >      doc
> >      htmlpages
> >      manpages
> > +    monolithic_tools_doc
> 
> If you put this in CMDLINE_SELECT you can avoid adding the disable line below.
> It will also prevent configure from adding an useless variable to config.mak.
> 
> >      podpages
> >      txtpages
> >  "
> > @@ -2193,6 +2195,7 @@ enable stripping
> >  enable asm
> >  enable debug
> >  enable doc
> > +disable monolithic_tools_doc
> >  enable optimizations
> >  enable runtime_cpudetect
> >  enable safe_bitstream_reader
> > @@ -4382,7 +4385,7 @@ fi
> >  
> >  echo "License: $license"
> >  
> > -echo "Creating config.mak and config.h..."
> > +echo "Creating config.mak, config.h, and doc/config.texi..."
> >  
> >  test -e Makefile || $ln_s "$source_path/Makefile" .
> >  
> > @@ -4572,6 +4575,9 @@ if test -n "$WARNINGS"; then
> >      enabled fatal_warnings && exit 1
> >  fi
> >  
> > +echo "@c auto-generated by configure" > doc/config.texi
> > +enabled $doc_monolithic_tools_doc && echo "@set monolithic-tools-doc yes" >> doc/config.texi
> 
> enabled monolithic_tools_doc
> 
> Also, you need to add a line with "mkdir -p doc" before this since the folder might not exist
> at this point in out-of-tree builds (It's created 30 lines below this for the pc-uninstalled 
> pkgconfig files).
> Looks good otherwise.

Fixed, updated.
-- 
FFmpeg = Funny and Frenzy Magic Pacific Esoteric Gadget
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0009-doc-enable-compilation-of-monolithic-tools-pages-wit.patch
Type: text/x-diff
Size: 3965 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130319/739a3ebe/attachment.bin>