Replace "vector const" by "const vector" otherwise gcc 4.6.0 fails.

[ffmpeg] / libswscale / Makefile

diff --git a/libswscale/Makefile b/libswscale/Makefile
index 82e9bfc025f2363059066fc29b799c311ed0ad9b..7f8f721e45646b0b3284e8faf12c972f0996764f 100644 (file)
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -1,26 +1,23 @@
+include $(SUBDIR)../config.mak
 
-include ../config.mak
+NAME = swscale
+FFLIBS = avutil
 
-NAME=swscale
-ifeq ($(BUILD_SHARED),yes)
-LIBVERSION=$(SWSVERSION)
-LIBMAJOR=$(SWSMAJOR)
-endif
+HEADERS = swscale.h
 
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
+OBJS = options.o rgb2rgb.o swscale.o utils.o yuv2rgb.o
 
-OBJS= swscale.o rgb2rgb.o yuv2rgb.o
-ifeq ($(TARGET_ALTIVEC),yes)
-OBJS+=  yuv2rgb_altivec.o
-endif
+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
 
-include ../common.mak
+DIRS = bfin mlib ppc sparc x86
 
-cs_test: cs_test.c $(LIB)
-
-swscale-example: swscale-example.o $(LIB)
-
-clean::
-       rm -f cs_test swscale-example
+include $(SUBDIR)../subdir.mak