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

[ffmpeg] / libswscale / Makefile

diff --git a/libswscale/Makefile b/libswscale/Makefile
index 4d17e5b2b7087796b51edeb547bc623e452b3fa3..3e8614da2b60ff10c451116a653e1b8dc5b2adb2 100644 (file)
--- a/libswscale/Makefile
+++ b/libswscale/Makefile
@@ -1,23 +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)          +=  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
-
-EXAMPLES  = swscale-example
-TESTPROGS = cs_test
 
-include $(SUBDIR)../subdir.mak
+HEADERS = swscale.h                                                     \
+          version.h                                                     \
 
-$(SUBDIR)cs_test: $(SUBDIR)cs_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: $(SUBDIR)swscale-example.o $(SUBDIR)$(LIBNAME)
-$(SUBDIR)swscale-example: EXTRALIBS += -lm
+TESTPROGS = colorspace                                                  \
+            swscale                                                     \