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

Stefano Sabatini stefasab at gmail.com
Wed Apr 24 18:43:01 CEST 2013


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.
---
 doc/all-components.texi |   31 -------------------------------
 doc/ffmpeg.texi         |   24 +++++++++++++++++++++++-
 doc/ffplay.texi         |   24 +++++++++++++++++++++++-
 doc/ffprobe.texi        |   24 +++++++++++++++++++++++-
 doc/ffserver.texi       |   24 +++++++++++++++++++++++-
 5 files changed, 92 insertions(+), 35 deletions(-)
 delete mode 100644 doc/all-components.texi

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..132c60b 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -1367,7 +1367,29 @@ ffmpeg -i src.ext -lmax 21*QP2LAMBDA dst.ext
 @c man end EXAMPLES
 
 @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..f33d437 100644
--- a/doc/ffplay.texi
+++ b/doc/ffplay.texi
@@ -202,7 +202,29 @@ Seek to percentage in file corresponding to fraction of width.
 @c man end
 
 @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..5d2f7ec 100644
--- a/doc/ffprobe.texi
+++ b/doc/ffprobe.texi
@@ -488,7 +488,29 @@ DV, GXF and AVI timecodes are available in format metadata
 @c man end TIMECODE
 
 @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..b7157cc 100644
--- a/doc/ffserver.texi
+++ b/doc/ffserver.texi
@@ -247,7 +247,29 @@ messages to stdout.
 @c man end
 
 @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
-- 
1.7.9.5



More information about the ffmpeg-devel mailing list