build: non-x86: Only compile mpegvideo optimizations when necessary

diff --git a/libavcodec/alpha/Makefile b/libavcodec/alpha/Makefile
index e55fe49b7bdd3b0f3ec31e54bb5f2074f891bdb9..e28200d45a41e428b47b625dbd253a06046003bc 100644 (file)
--- a/libavcodec/alpha/Makefile
+++ b/libavcodec/alpha/Makefile
@@ -2,5 +2,6 @@ OBJS += alpha/dsputil_alpha.o                                           \
         alpha/dsputil_alpha_asm.o                                       \
         alpha/motion_est_alpha.o                                        \
         alpha/motion_est_mvi_asm.o                                      \
-        alpha/mpegvideo_alpha.o                                         \
         alpha/simple_idct_alpha.o                                       \
+
+OBJS-$(CONFIG_MPEGVIDEO)                += alpha/mpegvideo_alpha.o

diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile
index 745a5bdfe2414d85f62171135e95fd3f8cfe2be6..f537e4f3e2b260d7a7a21e7c843740797e0a3793 100644 (file)
--- a/libavcodec/arm/Makefile
+++ b/libavcodec/arm/Makefile
@@ -14,6 +14,7 @@ OBJS-$(CONFIG_FLAC_DECODER)            += arm/flacdsp_init_arm.o        \
 OBJS-$(CONFIG_MPEGAUDIODSP)            += arm/mpegaudiodsp_init_arm.o
 ARMV6-OBJS-$(CONFIG_MPEGAUDIODSP)      += arm/mpegaudiodsp_fixed_armv6.o
 
+OBJS-$(CONFIG_MPEGVIDEO)               += arm/mpegvideo_arm.o
 OBJS-$(CONFIG_VP3DSP)                  += arm/vp3dsp_init_arm.o
 OBJS-$(CONFIG_VP5_DECODER)             += arm/vp56dsp_init_arm.o
 OBJS-$(CONFIG_VP6_DECODER)             += arm/vp56dsp_init_arm.o
@@ -31,12 +32,12 @@ OBJS                                   += arm/dsputil_init_arm.o        \
                                           arm/fft_fixed_init_arm.o      \
                                           arm/fmtconvert_init_arm.o     \
                                           arm/jrevdct_arm.o             \
-                                          arm/mpegvideo_arm.o           \
                                           arm/simple_idct_arm.o         \
 
-ARMV5TE-OBJS                           += arm/dsputil_init_armv5te.o    \
-                                          arm/mpegvideo_armv5te.o       \
+ARMV5TE-OBJS-$(CONFIG_MPEGVIDEO)       += arm/mpegvideo_armv5te.o       \
                                           arm/mpegvideo_armv5te_s.o     \
+
+ARMV5TE-OBJS                           += arm/dsputil_init_armv5te.o    \
                                           arm/simple_idct_armv5te.o     \
 
 ARMV6-OBJS                             += arm/dsputil_init_armv6.o      \
@@ -70,6 +71,7 @@ NEON-OBJS-$(CONFIG_AAC_DECODER)        += arm/sbrdsp_neon.o             \
 NEON-OBJS-$(CONFIG_DCA_DECODER)        += arm/dcadsp_neon.o             \
                                           arm/synth_filter_neon.o       \
 
+NEON-OBJS-$(CONFIG_MPEGVIDEO)          += arm/mpegvideo_neon.o
 NEON-OBJS-$(CONFIG_RV30_DECODER)       += arm/rv34dsp_init_neon.o       \
                                           arm/rv34dsp_neon.o            \
 
@@ -92,5 +94,4 @@ NEON-OBJS                              += arm/dsputil_init_neon.o       \
                                           arm/dsputil_neon.o            \
                                           arm/fmtconvert_neon.o         \
                                           arm/int_neon.o                \
-                                          arm/mpegvideo_neon.o          \
                                           arm/simple_idct_neon.o        \

diff --git a/libavcodec/bfin/Makefile b/libavcodec/bfin/Makefile
index 6b3e7cf67c0c0051e1ac4c0f3fc2726e11ba0989..be81e6c39a30e84dc2bb7c8a955d6c962ebe0ff6 100644 (file)
--- a/libavcodec/bfin/Makefile
+++ b/libavcodec/bfin/Makefile
@@ -1,7 +1,8 @@
 OBJS += bfin/dsputil_bfin.o                                             \
         bfin/fdct_bfin.o                                                \
         bfin/idct_bfin.o                                                \
-        bfin/mpegvideo_bfin.o                                           \
         bfin/pixels_bfin.o                                              \
         bfin/vp3_bfin.o                                                 \
         bfin/vp3_idct_bfin.o                                            \
+
+OBJS-$(CONFIG_MPEGVIDEOENC)             += bfin/mpegvideo_bfin.o

diff --git a/libavcodec/mips/Makefile b/libavcodec/mips/Makefile
index 37899b1f7addda87bd9b8b24c1283fa8ee157d70..5f00d7036065b640897341ac19599e0fceb54fc9 100644 (file)
--- a/libavcodec/mips/Makefile
+++ b/libavcodec/mips/Makefile
@@ -1,3 +1,4 @@
 MMI-OBJS += mips/dsputil_mmi.o                                          \
             mips/idct_mmi.o                                             \
-            mips/mpegvideo_mmi.o                                        \
+
+MMI-OBJS-$(CONFIG_MPEGVIDEO)            += mips/mpegvideo_mmi.o

diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile
index e5d1d39d43f4aa303d6f7e71d77fcf965dad6a63..f7548e375a6f4af3aca9e180edc2bb18a46aca98 100644 (file)
--- a/libavcodec/ppc/Makefile
+++ b/libavcodec/ppc/Makefile
@@ -7,6 +7,7 @@ ALTIVEC-OBJS-$(CONFIG_FFT)             += ppc/fft_altivec.o             \
                                           $(FFT-OBJS-yes)
 ALTIVEC-OBJS-$(CONFIG_H264DSP)         += ppc/h264_altivec.o
 ALTIVEC-OBJS-$(CONFIG_MPEGAUDIODSP)    += ppc/mpegaudiodec_altivec.o
+ALTIVEC-OBJS-$(CONFIG_MPEGVIDEO)       += ppc/mpegvideo_altivec.o
 ALTIVEC-OBJS-$(CONFIG_VC1_DECODER)     += ppc/vc1dsp_altivec.o
 ALTIVEC-OBJS-$(CONFIG_VP8_DECODER)     += ppc/vp8dsp_altivec.o
 
@@ -17,4 +18,3 @@ ALTIVEC-OBJS                           += ppc/dsputil_altivec.o         \
                                           ppc/gmc_altivec.o             \
                                           ppc/idct_altivec.o            \
                                           ppc/int_altivec.o             \
-                                          ppc/mpegvideo_altivec.o       \