From f40cf96ec0f4a2e9d9caf85d5c4405e89a69d55b Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Wed, 24 Apr 2013 18:39:49 +0200 Subject: [PATCH] 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. --- 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(-) delete mode 100644 doc/all-components.texi diff --git a/doc/all-components.texi b/doc/all-components.texi deleted file mode 100644 index 177cf1031f..0000000000 --- a/doc/all-components.texi +++ /dev/null @@ -1,31 +0,0 @@ -@include config.texi - -@ifset config-avutil -@include utils.texi -@end ifset - -@ifset config-avcodec -@include codecs.texi -@include bitstream_filters.texi -@end ifset - -@ifset config-avformat -@include formats.texi -@include protocols.texi -@end ifset - -@ifset config-avdevice -@include devices.texi -@end ifset - -@ifset config-swresample -@include resampler.texi -@end ifset - -@ifset config-swscale -@include scaler.texi -@end ifset - -@ifset config-avfilter -@include filters.texi -@end ifset diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 94f48fdcf7..2e05844ba0 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 +@include config.texi @ifset config-all -@include all-components.texi +@ifset config-avutil +@include utils.texi +@end ifset +@ifset config-avcodec +@include codecs.texi +@include bitstream_filters.texi +@end ifset +@ifset config-avformat +@include formats.texi +@include protocols.texi +@end ifset +@ifset config-avdevice +@include devices.texi +@end ifset +@ifset config-swresample +@include resampler.texi +@end ifset +@ifset config-swscale +@include scaler.texi +@end ifset +@ifset config-avfilter +@include filters.texi +@end ifset @end ifset @chapter See Also diff --git a/doc/ffplay.texi b/doc/ffplay.texi index 21a6e6ce44..943cbb922c 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 +@include config.texi @ifset config-all -@include all-components.texi +@ifset config-avutil +@include utils.texi +@end ifset +@ifset config-avcodec +@include codecs.texi +@include bitstream_filters.texi +@end ifset +@ifset config-avformat +@include formats.texi +@include protocols.texi +@end ifset +@ifset config-avdevice +@include devices.texi +@end ifset +@ifset config-swresample +@include resampler.texi +@end ifset +@ifset config-swscale +@include scaler.texi +@end ifset +@ifset config-avfilter +@include filters.texi +@end ifset @end ifset @chapter See Also diff --git a/doc/ffprobe.texi b/doc/ffprobe.texi index aacee3ae5e..01e9829148 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 +@include config.texi @ifset config-all -@include all-components.texi +@ifset config-avutil +@include utils.texi +@end ifset +@ifset config-avcodec +@include codecs.texi +@include bitstream_filters.texi +@end ifset +@ifset config-avformat +@include formats.texi +@include protocols.texi +@end ifset +@ifset config-avdevice +@include devices.texi +@end ifset +@ifset config-swresample +@include resampler.texi +@end ifset +@ifset config-swscale +@include scaler.texi +@end ifset +@ifset config-avfilter +@include filters.texi +@end ifset @end ifset @chapter See Also diff --git a/doc/ffserver.texi b/doc/ffserver.texi index 8844941fcc..bfc2e608c8 100644 --- a/doc/ffserver.texi +++ b/doc/ffserver.texi @@ -246,8 +246,31 @@ messages to stdout. @end table @c man end +@include config.texi @ifset config-all -@include all-components.texi +@ifset config-avutil +@include utils.texi +@end ifset +@ifset config-avcodec +@include codecs.texi +@include bitstream_filters.texi +@end ifset +@ifset config-avformat +@include formats.texi +@include protocols.texi +@end ifset +@ifset config-avdevice +@include devices.texi +@end ifset +@ifset config-swresample +@include resampler.texi +@end ifset +@ifset config-swscale +@include scaler.texi +@end ifset +@ifset config-avfilter +@include filters.texi +@end ifset @end ifset @chapter See Also