lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields

[ffmpeg] / libswscale / Makefile

diff --git a/libswscale/Makefile b/libswscale/Makefile
index bf75b64959248cd861be486ccec81f3455a5f14f..3e8614da2b60ff10c451116a653e1b8dc5b2adb2 100644 (file)
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -1,31 +1,16 @@
-include $(SUBDIR)../config.mak
-
 NAME = swscale
-FFLIBS = avutil
-
-HEADERS = swscale.h
-
-OBJS = rgb2rgb.o swscale.o swscale_avoption.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_VIS)           +=  sparc/yuv2rgb_vis.o
-
-MMX-OBJS-$(CONFIG_GPL)     +=  x86/yuv2rgb_mmx.o        \
-
-OBJS-$(HAVE_MMX)           +=  $(MMX-OBJS-yes)
-
-EXAMPLES  = swscale
-TESTPROGS = colorspace
-
-DIRS = bfin mlib ppc sparc x86
 
-include $(SUBDIR)../subdir.mak
+HEADERS = swscale.h                                                     \
+          version.h                                                     \
 
-$(SUBDIR)colorspace-test$(EXESUF): $(SUBDIR)colorspace-test.o $(SUBDIR)$(LIBNAME)
+OBJS = input.o                                          \
+       options.o                                        \
+       output.o                                         \
+       rgb2rgb.o                                        \
+       swscale.o                                        \
+       swscale_unscaled.o                               \
+       utils.o                                          \
+       yuv2rgb.o                                        \
 
-$(SUBDIR)swscale-example$(EXESUF): $(SUBDIR)swscale-example.o $(SUBDIR)$(LIBNAME)
-$(SUBDIR)swscale-example$(EXESUF): EXTRALIBS += -lm
+TESTPROGS = colorspace                                                  \
+            swscale                                                     \