From 43527e3edde76850a26d16666fead8ea9cf9ce93 Mon Sep 17 00:00:00 2001 From: Måns Rullgård Date: Thu, 3 Apr 2008 22:39:54 +0000 Subject: clean up DEP_LIBS setting Originally committed as revision 12681 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bb4967b10a..7bfcfb7bf7 100644 --- a/Makefile +++ b/Makefile @@ -24,11 +24,14 @@ ALLPROGS = $(addsuffix $(EXESUF), $(BASENAMES)) ALLPROGS_G = $(addsuffix _g$(EXESUF), $(BASENAMES)) ALLMANPAGES = $(addsuffix .1, $(BASENAMES)) -ifeq ($(BUILD_SHARED),yes) -DEP_LIBS = libavdevice/$(SLIBPREF)avdevice$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF) -else -DEP_LIBS = libavdevice/$(LIBPREF)avdevice$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) -endif +LIBS-$(CONFIG_AVFILTER) += avfilter +LIBS-$(CONFIG_POSTPROC) += postproc +LIBS-$(CONFIG_SWSCALE) += swscale + +LIBS := avcodec avdevice avformat avutil $(LIBS-yes) + +S := $(BUILD_SHARED:yes=S) +DEP_LIBS := $(foreach L,$(LIBS),lib$(L)/$($(S)LIBPREF)$(L)$($(S)LIBSUF)) ALL_TARGETS-$(CONFIG_VHOOK) += videohook ALL_TARGETS-$(BUILD_DOC) += documentation -- cgit v1.2.3