diff Makefile @ 3717:ea9fe1c9d126 libavcodec

Remove the LGPL exception clause as discussed on ffmpeg-devel and move the dependent code under CONFIG_GPL.
author diego
date Thu, 14 Sep 2006 00:38:03 +0000
parents 6795c9e5f983
children 4d346abd723c
line wrap: on
line diff
--- a/Makefile	Wed Sep 13 21:39:41 2006 +0000
+++ b/Makefile	Thu Sep 14 00:38:03 2006 +0000
@@ -292,11 +292,11 @@
 ifeq ($(TARGET_MMX),yes)
 OBJS += i386/fdct_mmx.o i386/cputest.o \
 	i386/dsputil_mmx.o i386/mpegvideo_mmx.o \
-	i386/idct_mmx.o i386/motion_est_mmx.o \
+	i386/motion_est_mmx.o \
 	i386/simple_idct_mmx.o i386/fft_sse.o i386/vp3dsp_mmx.o \
 	i386/vp3dsp_sse2.o i386/fft_3dn.o i386/fft_3dn2.o i386/snowdsp_mmx.o
 ifeq ($(CONFIG_GPL),yes)
-OBJS += i386/idct_mmx_xvid.o
+OBJS += i386/idct_mmx.o i386/idct_mmx_xvid.o
 endif
 ifeq ($(CONFIG_CAVS_DECODER),yes)
 OBJS += i386/cavsdsp_mmx.o