Mercurial > libavcodec.hg
changeset 11501:cd71b238e78b libavcodec
Simplify arch-specific object file lists
| author | mru |
|---|---|
| date | Tue, 16 Mar 2010 21:23:03 +0000 |
| parents | 8ae93fdefcd7 |
| children | eb86fea1146b |
| files | alpha/Makefile arm/Makefile bfin/Makefile ppc/Makefile sh4/Makefile x86/Makefile |
| diffstat | 6 files changed, 8 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/alpha/Makefile Tue Mar 16 21:22:59 2010 +0000 +++ b/alpha/Makefile Tue Mar 16 21:23:03 2010 +0000 @@ -1,4 +1,4 @@ -OBJS-$(ARCH_ALPHA) += alpha/dsputil_alpha.o \ +OBJS += alpha/dsputil_alpha.o \ alpha/dsputil_alpha_asm.o \ alpha/motion_est_alpha.o \ alpha/motion_est_mvi_asm.o \
--- a/arm/Makefile Tue Mar 16 21:22:59 2010 +0000 +++ b/arm/Makefile Tue Mar 16 21:23:03 2010 +0000 @@ -1,13 +1,12 @@ -ARM-OBJS-$(CONFIG_H264DSP) += arm/h264dsp_init_arm.o \ +OBJS-$(CONFIG_H264DSP) += arm/h264dsp_init_arm.o \ arm/h264pred_init_arm.o \ -OBJS-$(ARCH_ARM) += arm/dsputil_init_arm.o \ +OBJS += arm/dsputil_init_arm.o \ arm/dsputil_arm.o \ arm/fft_init_arm.o \ arm/jrevdct_arm.o \ arm/mpegvideo_arm.o \ arm/simple_idct_arm.o \ - $(ARM-OBJS-yes) OBJS-$(HAVE_ARMV5TE) += arm/dsputil_init_armv5te.o \ arm/mpegvideo_armv5te.o \
--- a/bfin/Makefile Tue Mar 16 21:22:59 2010 +0000 +++ b/bfin/Makefile Tue Mar 16 21:23:03 2010 +0000 @@ -1,4 +1,4 @@ -OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \ +OBJS += bfin/dsputil_bfin.o \ bfin/fdct_bfin.o \ bfin/idct_bfin.o \ bfin/mpegvideo_bfin.o \
--- a/ppc/Makefile Tue Mar 16 21:22:59 2010 +0000 +++ b/ppc/Makefile Tue Mar 16 21:23:03 2010 +0000 @@ -1,4 +1,4 @@ -OBJS-$(ARCH_PPC) += ppc/dsputil_ppc.o \ +OBJS += ppc/dsputil_ppc.o \ ALTIVEC-OBJS-$(CONFIG_H264DSP) += ppc/h264_altivec.o ALTIVEC-OBJS-$(CONFIG_VC1_DECODER) += ppc/vc1dsp_altivec.o
--- a/sh4/Makefile Tue Mar 16 21:22:59 2010 +0000 +++ b/sh4/Makefile Tue Mar 16 21:23:03 2010 +0000 @@ -1,3 +1,3 @@ -OBJS-$(ARCH_SH4) += sh4/dsputil_align.o \ +OBJS += sh4/dsputil_align.o \ sh4/dsputil_sh4.o \ sh4/idct_sh4.o \
--- a/x86/Makefile Tue Mar 16 21:22:59 2010 +0000 +++ b/x86/Makefile Tue Mar 16 21:23:03 2010 +0000 @@ -1,7 +1,5 @@ -X86-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o -X86-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o - -OBJS-$(ARCH_X86) += $(X86-OBJS-yes) +OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o +OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o YASM-OBJS-FFT-$(HAVE_AMD3DNOW) += x86/fft_3dn.o YASM-OBJS-FFT-$(HAVE_AMD3DNOWEXT) += x86/fft_3dn2.o