diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-03-06 20:44:44 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-03-06 20:44:44 +0000 |
| commit | 5671fc14f67dd20bb9c4a787022987c39498f44f (patch) | |
| tree | c390cc924efbd489b32a6589f1deba5429e04b16 /libavfilter | |
| parent | 4c7981ba7c532928dbe60934a9fc951dbf8a34b5 (diff) | |
| download | ffmpeg-5671fc14f67dd20bb9c4a787022987c39498f44f.tar.gz | |
consolidate CFLAGS, LDFLAGS, EXTRALIBS assignment
Originally committed as revision 12354 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/Makefile | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 69875d829d..eca5654986 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -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 \ defaults.o \ @@ -11,17 +9,10 @@ OBJS = allfilters.o \ HEADERS = avfilter.h -EXTRALIBS := -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \ - -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) - -ifeq ($(CONFIG_SWSCALER),yes) -EXTRALIBS+=-L$(BUILD_ROOT)/libswscale -EXTRALIBS+=-lswscale$(BUILDSUF) -endif +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=$(LAVFIVERSION) |