diff --git a/configure b/configure
index ba7737859f..afcc017a00 100755
--- a/configure
+++ b/configure
@@ -7611,27 +7611,16 @@ $_target_arch
 $_target_arch_x86
 $_confwin32
 TARGET_CPU=$iproc
-TARGET_MMX = $_mmx
 HAVE_MMX   = $_mmx
-TARGET_MMX2 = $_mmxext
 HAVE_MMX2   = $_mmxext
-TARGET_3DNOW = $_3dnow
 HAVE_3DNOW   = $_3dnow
-TARGET_3DNOWEX = $_3dnowext
 HAVE_3DNOWEX   = $_3dnowext
-TARGET_SSE = $_sse
 HAVE_SSE   = $_sse
-TARGET_CMOV = $_cmov
 HAVE_CMOV   = $_cmov
-TARGET_ALTIVEC = $_altivec
 HAVE_ALTIVEC   = $_altivec
-TARGET_ARMV5TE = $_armv5te
 HAVE_ARMV5TE   = $_armv5te
-TARGET_ARMV6 = $_armv6
 HAVE_ARMV6   = $_armv6
-TARGET_IWMMXT = $_iwmmxt
 HAVE_IWMMXT   = $_iwmmxt
-TARGET_VIS = $_vis
 HAVE_VIS   = $_vis
 
 # --- GUI stuff ---
diff --git a/libmpeg2/Makefile b/libmpeg2/Makefile
index d0f49a5d9c..456d793027 100644
--- a/libmpeg2/Makefile
+++ b/libmpeg2/Makefile
@@ -11,9 +11,9 @@ SRCS_COMMON = alloc.c \
 	      motion_comp.c \
 	      slice.c \
 
-SRCS_COMMON-$(TARGET_MMX)        += idct_mmx.c motion_comp_mmx.c
-SRCS_COMMON-$(TARGET_ALTIVEC)    += motion_comp_altivec.c idct_altivec.c
-SRCS_COMMON-$(TARGET_VIS)        += motion_comp_vis.c
+SRCS_COMMON-$(HAVE_MMX)        += idct_mmx.c motion_comp_mmx.c
+SRCS_COMMON-$(HAVE_ALTIVEC)    += motion_comp_altivec.c idct_altivec.c
+SRCS_COMMON-$(HAVE_VIS)        += motion_comp_vis.c
 SRCS_COMMON-$(ARCH_ALPHA) += idct_alpha.c motion_comp_alpha.c
 SRCS_COMMON-$(ARCH_ARMV4L) += motion_comp_arm.c motion_comp_iwmmxt.c motion_comp_arm_s.S
 
diff --git a/mp3lib/Makefile b/mp3lib/Makefile
index 48de239be2..75bcb8f196 100644
--- a/mp3lib/Makefile
+++ b/mp3lib/Makefile
@@ -3,15 +3,15 @@ include ../config.mak
 LIBNAME_COMMON = libmp3.a
 
 SRCS_COMMON = sr1.c
-SRCS_COMMON-$(TARGET_MMX)     += decode_MMX.c
-SRCS_COMMON-$(TARGET_SSE)     += dct64_sse.c
+SRCS_COMMON-$(HAVE_MMX)       += decode_MMX.c
+SRCS_COMMON-$(HAVE_SSE)       += dct64_sse.c
 ifeq ($(ARCH_X86_32),yes)
 SRCS_COMMON                   += decode_i586.c
-SRCS_COMMON-$(TARGET_MMX)     += dct64_MMX.c
-SRCS_COMMON-$(TARGET_3DNOW)   += dct36_3dnow.c dct64_3dnow.c
-SRCS_COMMON-$(TARGET_3DNOWEX) += dct36_k7.c dct64_k7.c
+SRCS_COMMON-$(HAVE_MMX)       += dct64_MMX.c
+SRCS_COMMON-$(HAVE_3DNOW)     += dct36_3dnow.c dct64_3dnow.c
+SRCS_COMMON-$(HAVE_3DNOWEX)   += dct36_k7.c dct64_k7.c
 endif
-SRCS_COMMON-$(TARGET_ALTIVEC) += dct64_altivec.c
+SRCS_COMMON-$(HAVE_ALTIVEC)   += dct64_altivec.c
 
 include ../mpcommon.mak