diff --git a/libavcodec/alpha/Makefile b/libavcodec/alpha/Makefile
index 3493adfbc2fb0c37c93b8123cd470fb3f8e3ec6c..2779a2316a90f2228406bca7eaf445794c66eba9 100644
--- a/libavcodec/alpha/Makefile
+++ b/libavcodec/alpha/Makefile
@@ -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 \
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile
index 14946b846658e025faa0ed7229774079652b437c..d05a07e756fbf4b96552a09318496f3406b0ba06 100644
--- a/libavcodec/arm/Makefile
+++ b/libavcodec/arm/Makefile
@@ -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 \
diff --git a/libavcodec/bfin/Makefile b/libavcodec/bfin/Makefile
index e86e6b0fd80d5e531f841e0a76cb9cf7bca45afa..e50e3cd6695a5be1468334cb914359d9fa1dec81 100644
--- a/libavcodec/bfin/Makefile
+++ b/libavcodec/bfin/Makefile
@@ -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 \
diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile
index 52e0cf628c05e30b49ae6bd59eb9b2da94f5b87d..5d5a59b4c542f0d9b79a28b553509cf5a6b0a138 100644
--- a/libavcodec/ppc/Makefile
+++ b/libavcodec/ppc/Makefile
@@ -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
diff --git a/libavcodec/sh4/Makefile b/libavcodec/sh4/Makefile
index d77678cf570088933644102d92d6a2e8d8954cdb..142cba47d1cc4c8130510e0c974dd699f90f4e2a 100644
--- a/libavcodec/sh4/Makefile
+++ b/libavcodec/sh4/Makefile
@@ -1,3 +1,3 @@
-OBJS-$(ARCH_SH4) += sh4/dsputil_align.o \
+OBJS += sh4/dsputil_align.o \
sh4/dsputil_sh4.o \
sh4/idct_sh4.o \
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index daf6aef07851ffab0d7c6ad68f86817f99fef229..f4d0c847dc9438816a762d74e910006546b0a54c 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -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