aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-06-21 21:38:19 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-06-21 21:38:19 +0000
commitdd46b538ecea62e3bcee0a7a429430973cdefc2a (patch)
treea7c2cc2d779f82eff718c662a68e1c98b875609a
parenta8ead3322fdbe4670101185204b55fef8e7e0422 (diff)
downloadffmpeg-dd46b538ecea62e3bcee0a7a429430973cdefc2a.tar.gz
Update documentation dependencies, make ff* tools manpages and HTML
pages depend of fftools-common-opts.texi. Originally committed as revision 23687 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 4b945f439f..f83956f314 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