Skip to content

F
ffmpeg.wasm-core
Commit 43527e3e authored by Måns Rullgård's avatar Måns Rullgård
Browse files
Options

clean up DEP_LIBS setting 

Originally committed as revision 12681 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9006f5d0
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 5 deletions
Makefile
View file @ 43527e3e
...@@ -24,11 +24,14 @@ ALLPROGS = $(addsuffix $(EXESUF), $(BASENAMES)) ...@@ -24,11 +24,14 @@ ALLPROGS = $(addsuffix $(EXESUF), $(BASENAMES))
ALLPROGS_G = $(addsuffix _g$(EXESUF), $(BASENAMES)) ALLPROGS_G = $(addsuffix _g$(EXESUF), $(BASENAMES))
ALLMANPAGES = $(addsuffix .1, $(BASENAMES)) ALLMANPAGES = $(addsuffix .1, $(BASENAMES))
ifeq ($(BUILD_SHARED),yes) LIBS-$(CONFIG_AVFILTER) += avfilter
DEP_LIBS = libavdevice/$(SLIBPREF)avdevice$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF) LIBS-$(CONFIG_POSTPROC) += postproc
else LIBS-$(CONFIG_SWSCALE) += swscale
DEP_LIBS = libavdevice/$(LIBPREF)avdevice$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF)
endif 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-$(CONFIG_VHOOK) += videohook
ALL_TARGETS-$(BUILD_DOC) += documentation ALL_TARGETS-$(BUILD_DOC) += documentation
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment