Move arch check before OS check.

[ffmpeg] / libavfilter / Makefile

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 0043c1c9f2552037434526659a717645bf5ce46f..2357aeea448967d4ec915da157ed91574484d025 100644 (file)
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -1,30 +1,17 @@
-include ../config.mak
+include $(SUBDIR)../config.mak
 
-CFLAGS+=-I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libswscale
+NAME = avfilter
+FFLIBS = avcodec avutil
+FFLIBS-$(CONFIG_SWSCALE)       += swscale
+FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat
 
-OBJS = avfilter.o \
-       avfiltergraph.o \
-       avfiltergraphdesc.o \
+OBJS = allfilters.o \
+       avfilter.o \
        defaults.o \
+       formats.o \
 
-# TODO: real conditional compilation
-OBJS-yes = vf_crop.o \
-           vf_fifo.o \
-           vf_fps.o \
-           vf_negate.o \
-           vf_overlay.o \
-           vf_passthrough.o \
-           vf_scale.o \
-           vf_slicify.o \
-           vf_split.o \
-           vf_vflip.o \
+#OBJS-$(CONFIG_XXX_FILTER)    += vf_xxx.o
 
 HEADERS = avfilter.h
 
-EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) -L$(BUILD_ROOT)/libswscale -lswscale$(BUILDSUF) -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) $(EXTRALIBS)
-
-NAME=avfilter
-LIBVERSION=$(LAVFILTERVERSION)
-LIBMAJOR=$(LAVFILTERMAJOR)
-
-include ../common.mak
+include $(SUBDIR)../subdir.mak