[FFmpeg-devel] [PATCH] doc/Makefile: rework component configuration logic

[Stefano Sabatini]

On date Thursday 2012-11-29 00:45:35 +0100, Clément Bœsch encoded:
> On Thu, Nov 29, 2012 at 12:21:25AM +0100, Stefano Sabatini wrote:
> > Only include component manual when the corresponding library providing
> > the feature is enabled.
> > ---
> >  doc/Makefile |   33 ++++++++++++++++++++-------------
> >  1 file changed, 20 insertions(+), 13 deletions(-)
> > 
> > diff --git a/doc/Makefile b/doc/Makefile
> > index 6635454..9cfbc1c 100644
> > --- a/doc/Makefile
> > +++ b/doc/Makefile
> > @@ -1,16 +1,23 @@
> > -DOCLIBS-$(CONFIG_AVUTIL)  += libavutil
> > -DOCLIBS-$(CONFIG_SWSCALE) += libswscale
> > -DOCLIBS-$(CONFIG_SWRESAMPLE) += libswresample
> > -DOCLIBS-$(CONFIG_AVCODEC) += libavcodec
> > -DOCLIBS-$(CONFIG_AVFORMAT) += libavformat
> > -DOCLIBS-$(CONFIG_AVDEVICE) += libavdevice
> > -DOCLIBS-$(CONFIG_AVFILTER) += libavfilter
> > -
> > -COMPONENTS=$(PROGS-yes) ffmpeg-bitstream-filters ffmpeg-codecs ffmpeg-devices ffmpeg-filters ffmpeg-protocols ffmpeg-resampler ffmpeg-scaler ffmpeg-formats ffmpeg-utils
> > -
> > -MANPAGES    = $(COMPONENTS:%=doc/%.1)    $(DOCLIBS-yes:%=doc/%.3)
> > -PODPAGES    = $(COMPONENTS:%=doc/%.pod)  $(DOCLIBS-yes:%=doc/%.pod)
> > -HTMLPAGES   = $(COMPONENTS:%=doc/%.html) $(DOCLIBS-yes:%=doc/%.html)     \
> > +LIBRARIES-$(CONFIG_AVUTIL)     += libavutil
> > +LIBRARIES-$(CONFIG_SWSCALE)    += libswscale
> > +LIBRARIES-$(CONFIG_SWRESAMPLE) += libswresample
> > +LIBRARIES-$(CONFIG_AVCODEC)    += libavcodec
> > +LIBRARIES-$(CONFIG_AVFORMAT)   += libavformat
> > +LIBRARIES-$(CONFIG_AVDEVICE)   += libavdevice
> > +LIBRARIES-$(CONFIG_AVFILTER)   += libavfilter
> > +
> > +COMPONENTS-yes = $(PROGS-yes)
> > +COMPONENTS-$(CONFIG_AVUTIL)     += ffmpeg-utils
> > +COMPONENTS-$(CONFIG_SWSCALE)    += ffmpeg-scaler
> > +COMPONENTS-$(CONFIG_SWRESAMPLE) += ffmpeg-resampler
> > +COMPONENTS-$(CONFIG_AVCODEC)    += ffmpeg-codecs ffmpeg-bistream-filters
> > +COMPONENTS-$(CONFIG_AVFORMAT)   += ffmpeg-formats ffmpeg-protocols
> 

> There is a CONFIG_PROTOCOLS, maybe it could be used.

Possibly, but for the moment I want to keep the logic as simple as
possible.

> 
> > +COMPONENTS-$(CONFIG_AVDEVICE)   += ffmpeg-devices
> > +COMPONENTS-$(CONFIG_AVFILTER)   += ffmpeg-filters
> > +
> > +MANPAGES    = $(COMPONENTS-yes:%=doc/%.1)    $(LIBRARIES-yes:%=doc/%.3)
> > +PODPAGES    = $(COMPONENTS-yes:%=doc/%.pod)  $(LIBRARIES-yes:%=doc/%.pod)
> > +HTMLPAGES   = $(COMPONENTS-yes:%=doc/%.html) $(LIBRARIES-yes:%=doc/%.html)     \
> >                doc/developer.html                                        \
> >                doc/faq.html                                              \
> >                doc/fate.html                                             \
> 
> Should be OK, assuming these new dependencies won't cause problems in case
> if inter-inclusions between the documentations (doesn't look like so but
> well…).

Not a problem because each single texi snippet is not compiled but
only included in the containing document.

Patch applied, thanks.
-- 
FFmpeg = Formidable and Fostering Murdering Pitiless Ecumenical Gymnast