diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-04-03 22:39:54 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-04-03 22:39:54 +0000 |
| commit | 43527e3edde76850a26d16666fead8ea9cf9ce93 (patch) | |
| tree | 1ec1576df477bad74aaadfcdc1703b52e1115cc5 | |
| parent | 9006f5d0b1c4fb647b42988c7fdf1c8c8769a71c (diff) | |
| download | ffmpeg-43527e3edde76850a26d16666fead8ea9cf9ce93.tar.gz | |
clean up DEP_LIBS setting
Originally committed as revision 12681 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -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 |