From: Diego Biurrun <diego@biurrun.de>
Date: Sun, 12 Apr 2009 22:48:44 +0000 (+0000)
Subject: Move addition of MMX-OBJS to OBJS into common.mak instead of duplicating it.
X-Git-Tag: v0.6~4783
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5662879ff9ef705f8475e0ba9e0f9e2d4e7f0ac;p=platform%2Fupstream%2Flibav.git

Move addition of MMX-OBJS to OBJS into common.mak instead of duplicating it.

Originally committed as revision 18478 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/common.mak b/common.mak
index 9f1080f..23907af 100644
--- a/common.mak
+++ b/common.mak
@@ -57,6 +57,8 @@ uninstall: uninstall-libs uninstall-headers
 .PHONY: all depend dep *clean install* uninstall* examples testprogs
 endif
 
+OBJS-$(HAVE_MMX) +=  $(MMX-OBJS-yes)
+
 CFLAGS    += $(CFLAGS-yes)
 OBJS      += $(OBJS-yes)
 FFLIBS    := $(FFLIBS-yes) $(FFLIBS)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 2768057..5aaf614 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -463,7 +463,6 @@ OBJS-$(HAVE_MMX)                       += x86/cpuid.o                   \
                                           x86/motion_est_mmx.o          \
                                           x86/mpegvideo_mmx.o           \
                                           x86/simple_idct_mmx.o         \
-                                          $(MMX-OBJS-yes)
 
 OBJS-$(ARCH_ALPHA)                     += alpha/dsputil_alpha.o         \
                                           alpha/dsputil_alpha_asm.o     \