From 82ccbe6b273a19745ec5b9d6603b88e6bacca59d Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 14 Dec 2010 18:38:37 +0000 Subject: Simplify texi files naming: ff*-doc.texi -> ff*.texi. Originally committed as revision 26006 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8889a15..65b5c9a 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ PROGS_G = $(addsuffix _g$(EXESUF), $(PROGS-yes)) OBJS = $(addsuffix .o, $(PROGS-yes)) cmdutils.o MANPAGES = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes))) PODPAGES = $(addprefix doc/, $(addsuffix .pod, $(PROGS-yes))) -HTMLPAGES = $(addprefix doc/, $(addsuffix -doc.html, $(PROGS-yes))) +HTMLPAGES = $(addprefix doc/, $(addsuffix .html, $(PROGS-yes))) TOOLS = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws pktdumper probetest qt-faststart trasher)) HOSTPROGS = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr base64) @@ -22,7 +22,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)) +ALLHTMLPAGES= $(addsuffix .html, $(BASENAMES)) FFLIBS-$(CONFIG_AVDEVICE) += avdevice FFLIBS-$(CONFIG_AVFILTER) += avfilter @@ -116,16 +116,16 @@ documentation: $(addprefix doc/, developer.html faq.html general.html libavfilte $(HTMLPAGES) $(PODPAGES): doc/fftools-common-opts.texi -doc/ffmpeg.pod doc/ffmpeg-doc.html: doc/bitstream_filters.texi doc/eval.texi doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi -doc/ffplay.pod doc/ffplay-doc.html: doc/eval.texi doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi -doc/ffprobe.pod doc/ffprobe-doc.html: doc/indevs.texi doc/protocols.texi +doc/ffmpeg.pod doc/ffmpeg.html: doc/bitstream_filters.texi doc/eval.texi doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi +doc/ffplay.pod doc/ffplay.html: doc/eval.texi doc/indevs.texi doc/filters.texi doc/outdevs.texi doc/protocols.texi +doc/ffprobe.pod doc/ffprobe.html: doc/indevs.texi doc/protocols.texi doc/%.html: TAG = HTML doc/%.html: doc/%.texi $(M)cd doc && texi2html -monolithic -number $(<:doc/%=%) doc/%.pod: TAG = POD -doc/%.pod: doc/%-doc.texi +doc/%.pod: doc/%.texi $(M)doc/texi2pod.pl $< $@ doc/%.1: TAG = MAN -- cgit v1.1