[FFmpeg-soc] [soc]: r1996 - libavfilter/Makefile

vitor subversion at mplayerhq.hu
Fri Mar 7 18:05:16 CET 2008


Author: vitor
Date: Fri Mar  7 18:05:16 2008
New Revision: 1996

Log:
Sync with SVN

Modified:
   libavfilter/Makefile

Modified: libavfilter/Makefile
==============================================================================
--- libavfilter/Makefile	(original)
+++ libavfilter/Makefile	Fri Mar  7 18:05:16 2008
@@ -1,7 +1,5 @@
 include ../config.mak
 
-CFLAGS+=-I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libswscale
-
 OBJS = allfilters.o \
        avfilter.o \
        avfiltergraph.o \
@@ -31,16 +29,13 @@ OBJS-$(CONFIG_MOVIE_FILTER)      += vsrc
 
 HEADERS = avfilter.h
 
-EXTRALIBS := -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \
-             -L$(BUILD_ROOT)/libswscale -lswscale$(BUILDSUF) \
-             -L$(BUILD_ROOT)/libavutil  -lavutil$(BUILDSUF) $(EXTRALIBS)
+FFLIBS = avcodec avutil
 
-ifeq ($(CONFIG_AVFILTER_LAVF),yes)
-EXTRALIBS := -L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) $(EXTRALIBS)
-endif
+FFLIBS-$(CONFIG_SWSCALER)      += swscale
+FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat
 
 NAME=avfilter
-LIBVERSION=$(LAVFILTERVERSION)
-LIBMAJOR=$(LAVFILTERMAJOR)
+LIBVERSION=$(LAVFIVERSION)
+LIBMAJOR=$(LAVFIMAJOR)
 
 include ../common.mak



More information about the FFmpeg-soc mailing list