Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libswscale / Makefile

diff --git a/libswscale/Makefile b/libswscale/Makefile
index 697607968677c12ad2b6723d550998c88b862f51..97206200fb1767f2b4820fe58b9d2332f381cbd9 100644 (file)
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -5,18 +5,23 @@ FFLIBS = avutil
 
 HEADERS = swscale.h
 
-OBJS = options.o rgb2rgb.o swscale.o utils.o yuv2rgb.o
+OBJS = options.o rgb2rgb.o swscale.o utils.o yuv2rgb.o \
+       swscale_unscaled.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/yuv2rgb_mmx.o
+OBJS-$(HAVE_ALTIVEC)       +=  ppc/swscale_altivec.o    \
+                               ppc/yuv2rgb_altivec.o    \
+                               ppc/yuv2yuv_altivec.o
+OBJS-$(HAVE_MMX)           +=  x86/rgb2rgb.o            \
+                               x86/swscale_mmx.o        \
+                               x86/yuv2rgb_mmx.o
 OBJS-$(HAVE_VIS)           +=  sparc/yuv2rgb_vis.o
 
 TESTPROGS = colorspace swscale
 
 DIRS = bfin mlib ppc sparc x86
 
-include $(SUBDIR)../subdir.mak
+include $(SRC_PATH)/subdir.mak