non-recursive makefiles

[libav.git] / libavfilter / Makefile

diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index eca5654..2357aee 100644 (file)
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -1,4 +1,9 @@
-include ../config.mak
+include $(SUBDIR)../config.mak
+
+NAME = avfilter
+FFLIBS = avcodec avutil
+FFLIBS-$(CONFIG_SWSCALE)       += swscale
+FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat

 
 OBJS = allfilters.o \
        avfilter.o \
 
 OBJS = allfilters.o \
        avfilter.o \


@@ -9,13 +14,4 @@ OBJS = allfilters.o \
 
 HEADERS = avfilter.h
 
 
 HEADERS = avfilter.h
 

-FFLIBS = avcodec avutil
-
-FFLIBS-$(CONFIG_SWSCALER)      += swscale
-FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat
-
-NAME=avfilter
-LIBVERSION=$(LAVFIVERSION)
-LIBMAJOR=$(LAVFIMAJOR)
-
-include ../common.mak
+include $(SUBDIR)../subdir.mak