diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-12-14 18:38:37 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-12-14 18:38:37 +0000 |
| commit | 82ccbe6b273a19745ec5b9d6603b88e6bacca59d (patch) | |
| tree | ccae6e9f4f8172a239a462c5892cf5d44fb52a00 | |
| parent | 80575c0e55ef8d74b5ffd6b11939e9e8a2ddc35e (diff) | |
Simplify texi files naming: ff*-doc.texi -> ff*.texi.
Originally committed as revision 26006 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | doc/ffmpeg.texi (renamed from doc/ffmpeg-doc.texi) | 0 | ||||
| -rw-r--r-- | doc/ffplay.texi (renamed from doc/ffplay-doc.texi) | 0 | ||||
| -rw-r--r-- | doc/ffprobe.texi (renamed from doc/ffprobe-doc.texi) | 0 | ||||
| -rw-r--r-- | doc/ffserver.texi (renamed from doc/ffserver-doc.texi) | 0 |
5 files changed, 6 insertions, 6 deletions
@@ -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 diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg.texi index 397c3b4756..397c3b4756 100644 --- a/doc/ffmpeg-doc.texi +++ b/doc/ffmpeg.texi diff --git a/doc/ffplay-doc.texi b/doc/ffplay.texi index 07c887565f..07c887565f 100644 --- a/doc/ffplay-doc.texi +++ b/doc/ffplay.texi diff --git a/doc/ffprobe-doc.texi b/doc/ffprobe.texi index 0b5c11aa6c..0b5c11aa6c 100644 --- a/doc/ffprobe-doc.texi +++ b/doc/ffprobe.texi diff --git a/doc/ffserver-doc.texi b/doc/ffserver.texi index 77deb85317..77deb85317 100644 --- a/doc/ffserver-doc.texi +++ b/doc/ffserver.texi |