swscale: Remove disabled code.

[ffmpeg] / libswscale / Makefile

diff --git a/libswscale/Makefile b/libswscale/Makefile
index bf75b64959248cd861be486ccec81f3455a5f14f..7f8f721e45646b0b3284e8faf12c972f0996764f 100644 (file)
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -5,27 +5,19 @@ FFLIBS = avutil
 
 HEADERS = swscale.h
 
-OBJS = rgb2rgb.o swscale.o swscale_avoption.o yuv2rgb.o
+OBJS = options.o rgb2rgb.o swscale.o utils.o yuv2rgb.o
 
 OBJS-$(ARCH_BFIN)          +=  bfin/internal_bfin.o     \
                                bfin/swscale_bfin.o      \
                                bfin/yuv2rgb_bfin.o
 OBJS-$(CONFIG_MLIB)        +=  mlib/yuv2rgb_mlib.o
 OBJS-$(HAVE_ALTIVEC)       +=  ppc/yuv2rgb_altivec.o
+OBJS-$(HAVE_MMX)           +=  x86/rgb2rgb.o            \
+                               x86/yuv2rgb_mmx.o
 OBJS-$(HAVE_VIS)           +=  sparc/yuv2rgb_vis.o
 
-MMX-OBJS-$(CONFIG_GPL)     +=  x86/yuv2rgb_mmx.o        \
-
-OBJS-$(HAVE_MMX)           +=  $(MMX-OBJS-yes)
-
-EXAMPLES  = swscale
-TESTPROGS = colorspace
+TESTPROGS = colorspace swscale
 
 DIRS = bfin mlib ppc sparc x86
 
 include $(SUBDIR)../subdir.mak
-
-$(SUBDIR)colorspace-test$(EXESUF): $(SUBDIR)colorspace-test.o $(SUBDIR)$(LIBNAME)
-
-$(SUBDIR)swscale-example$(EXESUF): $(SUBDIR)swscale-example.o $(SUBDIR)$(LIBNAME)
-$(SUBDIR)swscale-example$(EXESUF): EXTRALIBS += -lm