configure: Use a separate config_components.h header for $ALL_COMPONENTS

This avoids unnecessary rebuilds of most source files if only the list of enabled components has changed, but not the other properties of the build, set in config.h. Signed-off-by: Martin Storsjö <[email protected]>
violin86318 · Mar 16, 2022 · a78f136 · a78f136
1 parent f3a0e2e
commit a78f136
Show file tree

Hide file tree

Showing 243 changed files with 459 additions and 2 deletions.
diff --git a/configure b/configure
@@ -7791,17 +7791,30 @@ print_config ARCH_   "$config_files" $ARCH_LIST
 print_config HAVE_   "$config_files" $HAVE_LIST
 print_config CONFIG_ "$config_files" $CONFIG_LIST       \
                                      $CONFIG_EXTRA      \
-                                     $ALL_COMPONENTS    \
 
 echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
-echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak
 
 # Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
 cp_if_changed $TMPH config.h
 touch ffbuild/.config
 
+# Copy config.asm before printing ALL_COMPONENTS; that's not needed in assembly.
 enabled x86asm && cp_if_changed $TMPASM config.asm
 
+# Reopen a new TMPH for config_components.h.
+cat > $TMPH <<EOF
+/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_COMPONENTS_H
+#define FFMPEG_CONFIG_COMPONENTS_H
+EOF
+
+print_config CONFIG_ "$config_files" $ALL_COMPONENTS
+
+echo "#endif /* FFMPEG_CONFIG_COMPONENTS_H */" >> $TMPH
+echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak
+
+cp_if_changed $TMPH config_components.h
+
 cat > $TMPH <<EOF
 /* Generated by ffmpeg configure */
 #ifndef AVUTIL_AVCONFIG_H

diff --git a/fftools/ffplay.c b/fftools/ffplay.c
@@ -24,6 +24,7 @@
  */
 
 #include "config.h"
+#include "config_components.h"
 #include <inttypes.h>
 #include <math.h>
 #include <limits.h>

diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c
@@ -37,6 +37,8 @@
  * http://aminet.net/mods/smpl/
  */
 
+#include "config_components.h"
+
 #include "libavutil/avassert.h"
 #include "avcodec.h"
 #include "internal.h"

diff --git a/libavcodec/a64multienc.c b/libavcodec/a64multienc.c
@@ -24,6 +24,8 @@
  * a64 video encoder - multicolor modes
  */
 
+#include "config_components.h"
+
 #include "a64colors.h"
 #include "a64tables.h"
 #include "elbg.h"

diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "parser.h"

diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c
@@ -28,6 +28,7 @@
  */
 
 #include "config.h"
+#include "config_components.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
 #include "aac.h"

diff --git a/libavcodec/aarch64/h264cmc_neon.S b/libavcodec/aarch64/h264cmc_neon.S
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include "libavutil/aarch64/asm.S"
 
 /* chroma_mc8(uint8_t *dst, uint8_t *src, ptrdiff_t stride, int h, int x, int y) */

diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c
@@ -21,6 +21,7 @@
  */
 
 #include "config.h"
+#include "config_components.h"
 
 #include "libavutil/channel_layout.h"
 #include "parser.h"

diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
@@ -24,6 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include <stdio.h>
 #include <stddef.h>
 #include <math.h>

diff --git a/libavcodec/ac3dec_float.c b/libavcodec/ac3dec_float.c
@@ -27,6 +27,9 @@
 /**
  * Upmix delay samples from stereo to original channel layout.
  */
+
+#include "config_components.h"
+
 #include "ac3dec.h"
 #include "eac3dec.c"
 #include "ac3dec.c"

diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
@@ -38,6 +38,7 @@
 #include "libavutil/opt.h"
 #include "libavutil/thread.h"
 #include "avcodec.h"
+#include "config_components.h"
 #include "encode.h"
 #include "internal.h"
 #include "me_cmp.h"

diff --git a/libavcodec/ac3enc_template.c b/libavcodec/ac3enc_template.c
@@ -26,6 +26,8 @@
  * AC-3 encoder float/fixed template
  */
 
+#include "config_components.h"
+
 #include <stdint.h>
 
 #include "libavutil/attributes.h"

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
@@ -34,6 +34,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "config_components.h"
+
 #include "avcodec.h"
 #include "get_bits.h"
 #include "bytestream.h"

diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c
@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include "libavutil/opt.h"
 
 #include "avcodec.h"

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
@@ -28,6 +28,7 @@
 #include <string.h>
 
 #include "config.h"
+#include "config_components.h"
 #include "libavutil/thread.h"
 #include "codec.h"
 #include "codec_id.h"

diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c
@@ -17,6 +17,7 @@
  */
 
 #include "config.h"
+#include "config_components.h"
 
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"

diff --git a/libavcodec/aptxdec.c b/libavcodec/aptxdec.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include "libavutil/channel_layout.h"
 #include "aptx.h"
 

diff --git a/libavcodec/aptxenc.c b/libavcodec/aptxenc.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include "libavutil/channel_layout.h"
 #include "aptx.h"
 #include "encode.h"

diff --git a/libavcodec/arm/flacdsp_init_arm.c b/libavcodec/arm/flacdsp_init_arm.c
@@ -21,6 +21,7 @@
 #include "libavutil/attributes.h"
 #include "libavcodec/flacdsp.h"
 #include "config.h"
+#include "config_components.h"
 
 void ff_flac_lpc_16_arm(int32_t *samples, const int coeffs[32], int order,
                         int qlevel, int len);

diff --git a/libavcodec/arm/h264cmc_neon.S b/libavcodec/arm/h264cmc_neon.S
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include "libavutil/arm/asm.S"
 
 /* chroma_mc8(uint8_t *dst, uint8_t *src, ptrdiff_t stride, int h, int x, int y) */

diff --git a/libavcodec/assdec.c b/libavcodec/assdec.c
@@ -23,6 +23,7 @@
 
 #include "avcodec.h"
 #include "ass.h"
+#include "config_components.h"
 #include "internal.h"
 #include "libavutil/internal.h"
 #include "libavutil/mem.h"

diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include <string.h>
 
 #include "avcodec.h"

diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c
@@ -30,6 +30,7 @@
 #include "asv.h"
 #include "avcodec.h"
 #include "blockdsp.h"
+#include "config_components.h"
 #include "idctdsp.h"
 #include "internal.h"
 #include "mpeg12data.h"

diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c
@@ -23,6 +23,8 @@
  * ASUS V1/V2 encoder.
  */
 
+#include "config_components.h"
+
 #include "libavutil/attributes.h"
 #include "libavutil/mem.h"
 

diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c
@@ -23,6 +23,7 @@
 #include <AudioToolbox/AudioToolbox.h>
 
 #include "config.h"
+#include "config_components.h"
 #include "avcodec.h"
 #include "ac3_parser_internal.h"
 #include "bytestream.h"

diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include "libavutil/film_grain_params.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/opt.h"

diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
@@ -28,6 +28,8 @@
  *  http://wiki.multimedia.cx/index.php?title=Bink_Audio
  */
 
+#include "config_components.h"
+
 #include "libavutil/channel_layout.h"
 #include "libavutil/intfloat.h"
 #include "libavutil/mem_internal.h"

diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c
@@ -28,6 +28,8 @@
  * iCEDraw File decoder
  */
 
+#include "config_components.h"
+
 #include "libavutil/intreadwrite.h"
 #include "libavutil/xga_font_data.h"
 #include "avcodec.h"

diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c
@@ -19,6 +19,7 @@
 #include <string.h>
 
 #include "config.h"
+#include "config_components.h"
 
 #include "libavutil/avassert.h"
 #include "libavutil/log.h"

diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c
@@ -45,6 +45,8 @@
  * Includes
  ****************************************************************************/
 
+#include "config_components.h"
+
 #define _XOPEN_SOURCE 600
 #include <inttypes.h>
 #include <stdio.h>

diff --git a/libavcodec/cuviddec.c b/libavcodec/cuviddec.c
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include "compat/cuda/dynlink_loader.h"
 
 #include "libavutil/buffer.h"

diff --git a/libavcodec/cyuv.c b/libavcodec/cyuv.c
@@ -28,6 +28,8 @@
  * Creative YUV (CYUV) Video Decoder.
  */
 
+#include "config_components.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/libavcodec/dxva2_av1.c b/libavcodec/dxva2_av1.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include "libavutil/avassert.h"
 #include "libavutil/pixdesc.h"
 

diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include "libavutil/avassert.h"
 
 #include "dxva2_internal.h"

diff --git a/libavcodec/dxva2_hevc.c b/libavcodec/dxva2_hevc.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include "libavutil/avassert.h"
 
 #include "dxva2_internal.h"

diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include "libavutil/log.h"
 
 #include "dxva2_internal.h"

diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include "dxva2_internal.h"
 #include "mpegutils.h"
 #include "mpegvideodec.h"

diff --git a/libavcodec/dxva2_vp9.c b/libavcodec/dxva2_vp9.c
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "config_components.h"
+
 #include "libavutil/avassert.h"
 #include "libavutil/pixdesc.h"
 

diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
@@ -33,6 +33,8 @@
  * downloaded from http://www.adobe.com/devnet/swf.html.
  */
 
+#include "config_components.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <zlib.h>

diff --git a/libavcodec/g726.c b/libavcodec/g726.c
@@ -21,6 +21,9 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "config_components.h"
+
 #include <limits.h>
 
 #include "libavutil/channel_layout.h"

diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c
@@ -24,6 +24,8 @@
  * GSM decoder
  */
 
+#include "config_components.h"
+
 #include "libavutil/channel_layout.h"
 #include "avcodec.h"
 #include "get_bits.h"

diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
@@ -27,6 +27,8 @@
 
 #define UNCHECKED_BITSTREAM_READER 1
 
+#include "config_components.h"
+
 #include "avcodec.h"
 #include "error_resilience.h"
 #include "flvdec.h"