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

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18478 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/common.mak b/common.mak
index 9f1080f2fe2a83c2cc9e6c4c3dd2c09b7103bca7..23907af9f26b60b3360a2ea64400354c067e0b25 100644 (file)
--- 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 2768057fe940049871fa372324f420c7ee85f8ea..5aaf61478b40211ad3d64b4369424c2b71c8ec48 100644 (file)
--- 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     \