summaryrefslogtreecommitdiffstats
path: root/mp3lib
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-24 15:32:44 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-04-24 15:32:44 +0000
commit9551fc7e63bb5e7d484bf0cb74d061c4318da01c (patch)
tree429b1470a46ed0ada14084f999d37c91464e37a8 /mp3lib
parentab5d23b62069e6dfcb5d0e717730d5957c0f9490 (diff)
downloadmpv-9551fc7e63bb5e7d484bf0cb74d061c4318da01c.tar.bz2
mpv-9551fc7e63bb5e7d484bf0cb74d061c4318da01c.tar.xz
Expand conditional addition of elements to variables with a form that permits
using two conditions. This allows getting rid of some ifeqs in Makefiles. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26516 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mp3lib')
-rw-r--r--mp3lib/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/mp3lib/Makefile b/mp3lib/Makefile
index 307feefe56..84d4998d9a 100644
--- a/mp3lib/Makefile
+++ b/mp3lib/Makefile
@@ -5,12 +5,10 @@ LIBNAME_COMMON = mp3lib.a
SRCS_COMMON = sr1.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-$(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-$(ARCH_X86_32)-$(HAVE_MMX) += dct64_mmx.c
+SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_3DNOW) += dct36_3dnow.c dct64_3dnow.c
+SRCS_COMMON-$(ARCH_X86_32)-$(HAVE_3DNOWEX) += dct36_k7.c dct64_k7.c
SRCS_COMMON-$(HAVE_ALTIVEC) += dct64_altivec.c
include ../mpcommon.mak