diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 13:45:25 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-04 13:49:01 +0400 |
commit | 90e1fc8bec1ba9ba40bfcc2ce0993dac6260d3af (patch) | |
tree | bbd03fec6663d7dbe90bf4ee6fbdfdb072f96bb9 | |
parent | 1e678007800ad9bd7332ea4f2250f5bcfac369ad (diff) | |
parent | 47b6cfc2a0333fb24f074d27830bf35ae5007050 (diff) |
Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'
* commit '47b6cfc2a0333fb24f074d27830bf35ae5007050':
avformat/output-example: Declare link dependency on libswscale in the Makefile
Conflicts:
libavformat/Makefile
Changes to libavformat/Makefile are not merged as our build system for the examples
is different.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | common.mak | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common.mak b/common.mak index dc4133a9da..6479b08e3c 100644 --- a/common.mak +++ b/common.mak @@ -99,7 +99,8 @@ TOOLOBJS := $(TOOLS:%=tools/%.o) TOOLS := $(TOOLS:%=tools/%$(EXESUF)) HEADERS += $(HEADERS-yes) -DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME)) +PATH_LIBNAME = $(foreach NAME,$(1),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME)) +DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib))) SRC_DIR := $(SRC_PATH)/lib$(NAME) ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h)) |