[MPlayer-cvslog] r26516 - in trunk: Makefile mp3lib/Makefile mpcommon.mak

[diego]

Author: diego
Date: Thu Apr 24 17:32:44 2008
New Revision: 26516

Log:
Expand conditional addition of elements to variables with a form that permits
using two conditions. This allows getting rid of some ifeqs in Makefiles.


Modified:
   trunk/Makefile
   trunk/mp3lib/Makefile
   trunk/mpcommon.mak

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Thu Apr 24 17:32:44 2008
@@ -163,6 +163,9 @@ SRCS_COMMON = asxparser.c \
               stream/stream_null.c \
               stream/url.c \
 
+SRCS_COMMON-$(AUDIO_INPUT)-$(ALSA1X) += stream/ai_alsa1x.c
+SRCS_COMMON-$(AUDIO_INPUT)-$(ALSA9)  += stream/ai_alsa.c
+SRCS_COMMON-$(AUDIO_INPUT)-$(OSS)    += stream/ai_oss.c
 SRCS_COMMON-$(BITMAP_FONT)           += libvo/font_load.c
 SRCS_COMMON-$(CDDA)                  += stream/stream_cdda.c \
                                         stream/cdinfo.c
@@ -304,11 +307,6 @@ SRCS_COMMON-$(XANIM_CODECS)          += 
 SRCS_COMMON-$(XVID4)                 += libmpcodecs/vd_xvid4.c
 SRCS_COMMON-$(ZORAN)                 += libmpcodecs/vd_zrmjpeg.c \
                                         libmpcodecs/vf_zrmjpeg.c
-ifeq ($(AUDIO_INPUT),yes)
-SRCS_COMMON-$(ALSA1X)                += stream/ai_alsa1x.c
-SRCS_COMMON-$(ALSA9)                 += stream/ai_alsa.c
-SRCS_COMMON-$(OSS)                   += stream/ai_oss.c
-endif
 
 
 SRCS_MPLAYER = mplayer.c \

Modified: trunk/mp3lib/Makefile
==============================================================================
--- trunk/mp3lib/Makefile	(original)
+++ trunk/mp3lib/Makefile	Thu Apr 24 17:32:44 2008
@@ -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

Modified: trunk/mpcommon.mak
==============================================================================
--- trunk/mpcommon.mak	(original)
+++ trunk/mpcommon.mak	Thu Apr 24 17:32:44 2008
@@ -1,4 +1,5 @@
 SRCS_COMMON          += $(SRCS_COMMON-yes)
+SRCS_COMMON          += $(SRCS_COMMON-yes-yes)
 SRCS_MPLAYER         += $(SRCS_MPLAYER-yes)
 SRCS_MENCODER        += $(SRCS_MENCODER-yes)