diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-04-12 22:48:44 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-04-12 22:48:44 +0000 |
| commit | c5662879ff9ef705f8475e0ba9e0f9e2d4e7f0ac (patch) | |
| tree | 230b33f5a297d272298d24dc75d46d0521ac7580 | |
| parent | 457eed7204d613f6a4e6bfbf67508de6a800e25a (diff) | |
| download | ffmpeg-c5662879ff9ef705f8475e0ba9e0f9e2d4e7f0ac.tar.gz | |
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
| -rw-r--r-- | common.mak | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/common.mak b/common.mak index 9f1080f2fe..23907af9f2 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 2768057fe9..5aaf61478b 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 \ |