[FFmpeg-devel] [PATCH 1/6] Update documentation dependencies.

[Stefano Sabatini]

On date Monday 2010-06-21 22:01:06 +0100, M?ns Rullg?rd encoded:
> Stefano Sabatini <stefano.sabatini-lala at poste.it> writes:
> 
> > On date Sunday 2010-06-13 21:06:01 +0200, Stefano Sabatini encoded:
> > [...]
> >
> > Updated.
> > -- 
> > FFmpeg = Frenzy and Fancy Multimedia Powered Emblematic Gargoyle
> >
> > From 16d6a71613d2d32d48a6ef37aed259900bb3f687 Mon Sep 17 00:00:00 2001
> > Message-Id: <16d6a71613d2d32d48a6ef37aed259900bb3f687.1277074012.git.stefano.sabatini-lala at poste.it>
> > From: Stefano Sabatini <stefano.sabatini-lala at poste.it>
> > Date: Sun, 13 Jun 2010 20:09:28 +0200
> > Subject: [modular-docs PATCH 1/3] Update documentation dependencies, make ff* tools manpages and HTML
> >  pages depend of fftools-common-opts.texi.
> >
> > ---
> >  Makefile |    9 ++++++---
> >  1 files changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/Makefile b/Makefile
> > index 4b945f4..fe0d537 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -13,6 +13,7 @@ PROGS      := $(addsuffix   $(EXESUF), $(PROGS-yes))
> >  PROGS_G     = $(addsuffix _g$(EXESUF), $(PROGS-yes))
> >  OBJS        = $(addsuffix .o,          $(PROGS-yes)) cmdutils.o
> >  MANPAGES    = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes)))
> > +HTMLPAGES   = $(addprefix doc/, $(addsuffix -doc.html, $(PROGS-yes)))
> >  TOOLS       = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws pktdumper probetest qt-faststart trasher))
> >  HOSTPROGS   = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr)
> >  
> > @@ -20,6 +21,7 @@ BASENAMES   = ffmpeg ffplay ffprobe ffserver
> >  ALLPROGS    = $(addsuffix   $(EXESUF), $(BASENAMES))
> >  ALLPROGS_G  = $(addsuffix _g$(EXESUF), $(BASENAMES))
> >  ALLMANPAGES = $(addsuffix .1, $(BASENAMES))
> > +ALLHTMLPAGES= $(addsuffix -doc.html, $(BASENAMES))
> >  
> >  FFLIBS-$(CONFIG_AVDEVICE) += avdevice
> >  FFLIBS-$(CONFIG_AVFILTER) += avfilter
> > @@ -101,9 +103,10 @@ version.h .version:
> >  
> >  alltools: $(TOOLS)
> >  
> > -documentation: $(addprefix doc/, developer.html faq.html ffmpeg-doc.html \
> > -                                 ffplay-doc.html ffprobe-doc.html ffserver-doc.html \
> > -                                 general.html libavfilter.html $(ALLMANPAGES))
> > +documentation: $(addprefix doc/, developer.html faq.html \
> > +                                 general.html libavfilter.html $(ALLHTMLPAGES) $(ALLMANPAGES))
> > +
> > +$(HTMLPAGES) $(MANPAGES): doc/fftools-common-opts.texi
> >  
> >  doc/%.html: TAG = HTML
> >  doc/%.html: doc/%.texi
> 
> OK

Applied.
-- 
FFmpeg = Friendly Frenzy MultiPurpose Earthshaking Gigant