[FFmpeg-cvslog] doc: remove all-components.texi, include its content verbatim

Stefano Sabatini git at videolan.org
Thu Apr 25 11:29:04 CEST 2013


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Wed Apr 24 18:39:49 2013 +0200| [f40cf96ec0f4a2e9d9caf85d5c4405e89a69d55b] | committer: Stefano Sabatini

doc: remove all-components.texi, include its content verbatim

Force re-generation of the manuals when an included file is modified.
The current dependency generation system is enable to track nested
inclusions.

The drawback is that the files will be generated even when there is no
strict need (for example if filters.texi is modified, ffmpeg.1 is
rebuilt), thus it trades a false negative with a false positive.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f40cf96ec0f4a2e9d9caf85d5c4405e89a69d55b
---

 doc/all-components.texi |   31 -------------------------------
 doc/ffmpeg.texi         |   25 ++++++++++++++++++++++++-
 doc/ffplay.texi         |   25 ++++++++++++++++++++++++-
 doc/ffprobe.texi        |   25 ++++++++++++++++++++++++-
 doc/ffserver.texi       |   25 ++++++++++++++++++++++++-
 5 files changed, 96 insertions(+), 35 deletions(-)

diff --git a/doc/all-components.texi b/doc/all-components.texi
deleted file mode 100644
index 177cf10..0000000
--- a/doc/all-components.texi
+++ /dev/null
@@ -1,31 +0,0 @@
- at include config.texi
-
- at ifset config-avutil
- at include utils.texi
- at end ifset
-
- at ifset config-avcodec
- at include codecs.texi
- at include bitstream_filters.texi
- at end ifset
-
- at ifset config-avformat
- at include formats.texi
- at include protocols.texi
- at end ifset
-
- at ifset config-avdevice
- at include devices.texi
- at end ifset
-
- at ifset config-swresample
- at include resampler.texi
- at end ifset
-
- at ifset config-swscale
- at include scaler.texi
- at end ifset
-
- at ifset config-avfilter
- at include filters.texi
- at end ifset
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 94f48fd..2e05844 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1366,8 +1366,31 @@ ffmpeg -i src.ext -lmax 21*QP2LAMBDA dst.ext
 @end itemize
 @c man end EXAMPLES
 
+ at include config.texi
 @ifset config-all
- at include all-components.texi
+ at ifset config-avutil
+ at include utils.texi
+ at end ifset
+ at ifset config-avcodec
+ at include codecs.texi
+ at include bitstream_filters.texi
+ at end ifset
+ at ifset config-avformat
+ at include formats.texi
+ at include protocols.texi
+ at end ifset
+ at ifset config-avdevice
+ at include devices.texi
+ at end ifset
+ at ifset config-swresample
+ at include resampler.texi
+ at end ifset
+ at ifset config-swscale
+ at include scaler.texi
+ at end ifset
+ at ifset config-avfilter
+ at include filters.texi
+ at end ifset
 @end ifset
 
 @chapter See Also
diff --git a/doc/ffplay.texi b/doc/ffplay.texi
index 21a6e6c..943cbb9 100644
--- a/doc/ffplay.texi
+++ b/doc/ffplay.texi
@@ -201,8 +201,31 @@ Seek to percentage in file corresponding to fraction of width.
 
 @c man end
 
+ at include config.texi
 @ifset config-all
- at include all-components.texi
+ at ifset config-avutil
+ at include utils.texi
+ at end ifset
+ at ifset config-avcodec
+ at include codecs.texi
+ at include bitstream_filters.texi
+ at end ifset
+ at ifset config-avformat
+ at include formats.texi
+ at include protocols.texi
+ at end ifset
+ at ifset config-avdevice
+ at include devices.texi
+ at end ifset
+ at ifset config-swresample
+ at include resampler.texi
+ at end ifset
+ at ifset config-swscale
+ at include scaler.texi
+ at end ifset
+ at ifset config-avfilter
+ at include filters.texi
+ at end ifset
 @end ifset
 
 @chapter See Also
diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi
index aacee3a..01e9829 100644
--- a/doc/ffprobe.texi
+++ b/doc/ffprobe.texi
@@ -487,8 +487,31 @@ DV, GXF and AVI timecodes are available in format metadata
 @end itemize
 @c man end TIMECODE
 
+ at include config.texi
 @ifset config-all
- at include all-components.texi
+ at ifset config-avutil
+ at include utils.texi
+ at end ifset
+ at ifset config-avcodec
+ at include codecs.texi
+ at include bitstream_filters.texi
+ at end ifset
+ at ifset config-avformat
+ at include formats.texi
+ at include protocols.texi
+ at end ifset
+ at ifset config-avdevice
+ at include devices.texi
+ at end ifset
+ at ifset config-swresample
+ at include resampler.texi
+ at end ifset
+ at ifset config-swscale
+ at include scaler.texi
+ at end ifset
+ at ifset config-avfilter
+ at include filters.texi
+ at end ifset
 @end ifset
 
 @chapter See Also
diff --git a/doc/ffserver.texi b/doc/ffserver.texi
index 8844941..bfc2e60 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -246,8 +246,31 @@ messages to stdout.
 @end table
 @c man end
 
+ at include config.texi
 @ifset config-all
- at include all-components.texi
+ at ifset config-avutil
+ at include utils.texi
+ at end ifset
+ at ifset config-avcodec
+ at include codecs.texi
+ at include bitstream_filters.texi
+ at end ifset
+ at ifset config-avformat
+ at include formats.texi
+ at include protocols.texi
+ at end ifset
+ at ifset config-avdevice
+ at include devices.texi
+ at end ifset
+ at ifset config-swresample
+ at include resampler.texi
+ at end ifset
+ at ifset config-swscale
+ at include scaler.texi
+ at end ifset
+ at ifset config-avfilter
+ at include filters.texi
+ at end ifset
 @end ifset
 
 @chapter See Also



More information about the ffmpeg-cvslog mailing list