Browse Source

clean up DEP_LIBS setting

Originally committed as revision 12681 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Måns Rullgård 18 years ago
parent
commit
43527e3edd
1 changed files with 8 additions and 5 deletions
  1. +8
    -5
      Makefile

+ 8
- 5
Makefile View File

@@ -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


Loading…
Cancel
Save