summaryrefslogtreecommitdiffstats
path: root/libswscale/Makefile
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-01 02:26:34 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-01 02:43:47 +0300
commitcf9edda1d370d39bc8a3d020a9c2bc4090d2457e (patch)
tree1d1bbc529a4e8109fb6aa5cadf0dbbb7bd61013a /libswscale/Makefile
parent7af8417ae7beb409f54849956a7037bc66c4c334 (diff)
parent1c37a6427abef0827c608d328d37ca1b1a0a022d (diff)
downloadmpv-cf9edda1d370d39bc8a3d020a9c2bc4090d2457e.tar.bz2
mpv-cf9edda1d370d39bc8a3d020a9c2bc4090d2457e.tar.xz
Merge svn changes up to r29117
Diffstat (limited to 'libswscale/Makefile')
-rw-r--r--libswscale/Makefile25
1 files changed, 16 insertions, 9 deletions
diff --git a/libswscale/Makefile b/libswscale/Makefile
index 6d500abc65..bf75b64959 100644
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -7,18 +7,25 @@ HEADERS = swscale.h
OBJS = rgb2rgb.o swscale.o swscale_avoption.o yuv2rgb.o
-OBJS-$(ARCH_BFIN) += internal_bfin.o swscale_bfin.o yuv2rgb_bfin.o
-OBJS-$(CONFIG_MLIB) += yuv2rgb_mlib.o
-OBJS-$(HAVE_ALTIVEC) += yuv2rgb_altivec.o
-OBJS-$(HAVE_VIS) += yuv2rgb_vis.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_VIS) += sparc/yuv2rgb_vis.o
-TESTS = cs_test swscale-example
+MMX-OBJS-$(CONFIG_GPL) += x86/yuv2rgb_mmx.o \
-CLEANFILES = cs_test swscale-example
+OBJS-$(HAVE_MMX) += $(MMX-OBJS-yes)
+
+EXAMPLES = swscale
+TESTPROGS = colorspace
+
+DIRS = bfin mlib ppc sparc x86
include $(SUBDIR)../subdir.mak
-$(SUBDIR)cs_test: $(SUBDIR)cs_test.o $(SUBDIR)$(LIBNAME)
+$(SUBDIR)colorspace-test$(EXESUF): $(SUBDIR)colorspace-test.o $(SUBDIR)$(LIBNAME)
-$(SUBDIR)swscale-example: $(SUBDIR)swscale-example.o $(SUBDIR)$(LIBNAME)
-$(SUBDIR)swscale-example: EXTRALIBS += -lm
+$(SUBDIR)swscale-example$(EXESUF): $(SUBDIR)swscale-example.o $(SUBDIR)$(LIBNAME)
+$(SUBDIR)swscale-example$(EXESUF): EXTRALIBS += -lm