diff options
| author | Martin Storsjö <martin@martin.st> | 2013-05-29 21:31:46 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-05-30 02:17:35 +0300 |
| commit | efb7968cfe8b285ab4f27b363719b7c92d19ec74 (patch) | |
| tree | 92700b4df87029910356ddf6dbccfe6ade2c51c3 | |
| parent | 36a7df8cf1115aa37a1b0d42324ecde5ab6c2304 (diff) | |
| download | ffmpeg-efb7968cfe8b285ab4f27b363719b7c92d19ec74.tar.gz | |
arm: Don't unconditionally build dsputil files
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/arm/Makefile | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index f4beb2da3a..2cb7449d98 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -1,16 +1,16 @@ ARCH_HEADERS = mathops.h -OBJS += arm/dsputil_init_arm.o \ - arm/dsputil_arm.o \ - arm/fmtconvert_init_arm.o \ - arm/jrevdct_arm.o \ - arm/simple_idct_arm.o \ +OBJS += arm/fmtconvert_init_arm.o OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_init_arm.o \ arm/sbrdsp_init_arm.o OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_init_arm.o \ arm/ac3dsp_arm.o OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_init_arm.o +OBJS-$(CONFIG_DSPUTIL) += arm/dsputil_init_arm.o \ + arm/dsputil_arm.o \ + arm/jrevdct_arm.o \ + arm/simple_idct_arm.o OBJS-$(CONFIG_FFT) += arm/fft_init_arm.o \ arm/fft_fixed_init_arm.o OBJS-$(CONFIG_FLAC_DECODER) += arm/flacdsp_init_arm.o \ @@ -33,15 +33,14 @@ OBJS-$(CONFIG_RV40_DECODER) += arm/rv34dsp_init_arm.o \ arm/rv40dsp_init_arm.o OBJS-$(CONFIG_VIDEODSP) += arm/videodsp_init_arm.o \ -ARMV5TE-OBJS += arm/dsputil_init_armv5te.o \ - arm/simple_idct_armv5te.o \ - +ARMV5TE-OBJS-$(CONFIG_DSPUTIL) += arm/dsputil_init_armv5te.o \ + arm/simple_idct_armv5te.o ARMV5TE-OBJS-$(CONFIG_MPEGVIDEO) += arm/mpegvideo_armv5te.o \ arm/mpegvideo_armv5te_s.o ARMV5TE-OBJS-$(CONFIG_VIDEODSP) += arm/videodsp_init_armv5te.o \ arm/videodsp_armv5te.o -ARMV6-OBJS += arm/dsputil_init_armv6.o \ +ARMV6-OBJS-$(CONFIG_DSPUTIL) += arm/dsputil_init_armv6.o \ arm/dsputil_armv6.o \ arm/simple_idct_armv6.o \ @@ -55,17 +54,17 @@ ARMV6-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8_armv6.o \ VFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o -NEON-OBJS += arm/dsputil_init_neon.o \ - arm/dsputil_neon.o \ - arm/fmtconvert_neon.o \ - arm/int_neon.o \ - arm/simple_idct_neon.o \ +NEON-OBJS += arm/fmtconvert_neon.o NEON-OBJS-$(CONFIG_AC3DSP) += arm/ac3dsp_neon.o NEON-OBJS-$(CONFIG_AAC_DECODER) += arm/aacpsdsp_neon.o \ arm/sbrdsp_neon.o NEON-OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_neon.o \ arm/synth_filter_neon.o +NEON-OBJS-$(CONFIG_DSPUTIL) += arm/dsputil_init_neon.o \ + arm/dsputil_neon.o \ + arm/int_neon.o \ + arm/simple_idct_neon.o NEON-OBJS-$(CONFIG_FFT) += arm/fft_neon.o \ arm/fft_fixed_neon.o NEON-OBJS-$(CONFIG_H264CHROMA) += arm/h264cmc_neon.o |