[FFmpeg-devel] [PATCH] Add $(ALLPODPAGES) to Makefile, fix dependency generation for pod files.

Måns Rullgård mans
Tue Feb 1 02:26:24 CET 2011


Stefano Sabatini <stefano.sabatini-lala at poste.it> writes:

> On date Tuesday 2011-02-01 00:54:35 +0000, M?ns Rullg?rd encoded:
>> Stefano Sabatini <stefano.sabatini-lala at poste.it> writes:
>> 
>> > ---
>> >  Makefile |    3 ++-
>> >  1 files changed, 2 insertions(+), 1 deletions(-)
>> >
>> > diff --git a/Makefile b/Makefile
>> > index fb9d8a4..4be2eaa 100644
>> > --- a/Makefile
>> > +++ b/Makefile
>> > @@ -23,6 +23,7 @@ BASENAMES   = ffmpeg ffplay ffprobe ffserver
>> >  ALLPROGS    = $(BASENAMES:%=%$(EXESUF))
>> >  ALLPROGS_G  = $(BASENAMES:%=%_g$(EXESUF))
>> >  ALLMANPAGES = $(BASENAMES:%=%.1)
>> > +ALLPODPAGES = $(BASENAMES:%=%.pod)
>> >  ALLHTMLPAGES= $(BASENAMES:%=%.html)
>> >
>> >  FFLIBS-$(CONFIG_AVDEVICE) += avdevice
>> > @@ -112,7 +113,7 @@ version.h .version:
>> >
>> >  alltools: $(TOOLS)
>> >
>> > -DOCS = $(addprefix doc/, developer.html faq.html general.html libavfilter.html $(ALLHTMLPAGES) $(ALLMANPAGES))
>> > +DOCS = $(addprefix doc/, developer.html faq.html general.html libavfilter.html $(ALLHTMLPAGES) $(ALLMANPAGES) $(ALLPODPAGES))
>> 
>> This line had me wondering, why do you build documentation for
>> disabled tools?  Wouldn't using the non-ALL versions of those
>> variables make more sense?
>
> Yes (as a separate commit).

Does this change look correct to you?

diff --git a/Makefile b/Makefile
index fb9d8a4..a2d90ca 100644
--- a/Makefile
+++ b/Makefile
@@ -112,7 +112,7 @@ version.h .version:
 
 alltools: $(TOOLS)
 
-DOCS = $(addprefix doc/, developer.html faq.html general.html libavfilter.html $(ALLHTMLPAGES) $(ALLMANPAGES))
+DOCS = $(addprefix doc/, developer.html faq.html general.html libavfilter.html) $(HTMLPAGES) $(MANPAGES) $(PODPAGES)
 
 documentation: $(DOCS)
 


-- 
M?ns Rullg?rd
mans at mansr.com



More information about the ffmpeg-devel mailing list