swscale: Remove disabled code.

[ffmpeg] / libswscale / Makefile

diff --git a/libswscale/Makefile b/libswscale/Makefile
index 93d27bac092d1a1fb002fe5d6a1d20a9865f19fa..7f8f721e45646b0b3284e8faf12c972f0996764f 100644 (file)
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -3,23 +3,21 @@ include $(SUBDIR)../config.mak
 NAME = swscale
 FFLIBS = avutil
 
-OBJS = rgb2rgb.o swscale.o swscale_avoption.o
+HEADERS = swscale.h
 
-OBJS-$(ARCH_BFIN)          +=  swscale_bfin.o yuv2rgb_bfin.o
-OBJS-$(CONFIG_GPL)         +=  yuv2rgb.o
-OBJS-$(CONFIG_MLIB)        +=  yuv2rgb_mlib.o
-OBJS-$(HAVE_ALTIVEC)       +=  yuv2rgb_altivec.o
-OBJS-$(HAVE_VIS)           +=  yuv2rgb_vis.o
+OBJS = options.o rgb2rgb.o swscale.o utils.o yuv2rgb.o
 
-ASM_OBJS-$(ARCH_BFIN)      +=  internal_bfin.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
 
-HEADERS = swscale.h rgb2rgb.h
+TESTPROGS = colorspace swscale
 
-CLEANFILES = cs_test swscale-example
+DIRS = bfin mlib ppc sparc x86
 
 include $(SUBDIR)../subdir.mak
-
-$(SUBDIR)cs_test: $(SUBDIR)cs_test.o $(SUBDIR)$(LIBNAME)
-
-$(SUBDIR)swscale-example: $(SUBDIR)swscale-example.o $(SUBDIR)$(LIBNAME)
-$(SUBDIR)swscale-example: EXTRALIBS += -lm