-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 \
-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 \
-OBJS-$(ARCH_BFIN) += bfin/dsputil_bfin.o \
+OBJS += bfin/dsputil_bfin.o \
bfin/fdct_bfin.o \
bfin/idct_bfin.o \
bfin/mpegvideo_bfin.o \
-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
-OBJS-$(ARCH_SH4) += sh4/dsputil_align.o \
+OBJS += sh4/dsputil_align.o \
sh4/dsputil_sh4.o \
sh4/idct_sh4.o \
-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