diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-03-27 23:10:02 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-04-12 09:00:49 +0200 |
| commit | 7bb3a302feeff37d14a2abb7c7316efa43f8dd5c (patch) | |
| tree | 6d7a6e40c54b8ed2c48f3f93e19a0be038429b6d /libavcodec/arm/Makefile | |
| parent | 2ef15b46e42647f6688d05abe2400fe008de5e0a (diff) | |
| download | ffmpeg-7bb3a302feeff37d14a2abb7c7316efa43f8dd5c.tar.gz | |
build: Consistently handle conditional compilation for all optimization OBJS.
Diffstat (limited to 'libavcodec/arm/Makefile')
| -rw-r--r-- | libavcodec/arm/Makefile | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index 2f5cea7df1..e6d92189de 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -27,21 +27,19 @@ OBJS += arm/dsputil_init_arm.o \ arm/mpegvideo_arm.o \ arm/simple_idct_arm.o \ -OBJS-$(HAVE_ARMV5TE) += arm/dsputil_init_armv5te.o \ +ARMV5TE-OBJS += arm/dsputil_init_armv5te.o \ arm/mpegvideo_armv5te.o \ arm/mpegvideo_armv5te_s.o \ arm/simple_idct_armv5te.o \ -OBJS-$(HAVE_ARMV6) += arm/dsputil_init_armv6.o \ +ARMV6-OBJS += arm/dsputil_init_armv6.o \ arm/dsputil_armv6.o \ arm/simple_idct_armv6.o \ - $(ARMV6-OBJS-yes) -VFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o \ +ARMVFP-OBJS-$(HAVE_ARMV6) += arm/fmtconvert_vfp.o -OBJS-$(HAVE_ARMVFP) += arm/dsputil_vfp.o \ +ARMVFP-OBJS += arm/dsputil_vfp.o \ arm/dsputil_init_vfp.o \ - $(VFP-OBJS-yes) NEON-OBJS-$(CONFIG_FFT) += arm/fft_neon.o \ arm/fft_fixed_neon.o \ @@ -83,10 +81,9 @@ NEON-OBJS-$(CONFIG_VP6_DECODER) += arm/vp56dsp_neon.o \ NEON-OBJS-$(CONFIG_VP8_DECODER) += arm/vp8dsp_neon.o -OBJS-$(HAVE_NEON) += arm/dsputil_init_neon.o \ +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 \ - $(NEON-OBJS-yes) |