Module: libav Branch: release/9 Commit: b5cacdb3e12927c63084d26d4c7d9d43ed00dd66
Author: Diego Biurrun <[email protected]> Committer: Diego Biurrun <[email protected]> Date: Tue Oct 1 13:34:02 2013 +0200 avformat/output-example: Declare link dependency on libswscale in the Makefile (cherry picked from commit 47b6cfc2a0333fb24f074d27830bf35ae5007050) Signed-off-by: Diego Biurrun <[email protected]> --- common.mak | 3 ++- libavformat/Makefile | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common.mak b/common.mak index 5d80986..a63eaf8 100644 --- a/common.mak +++ b/common.mak @@ -25,7 +25,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))) ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h)) SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 9b6a23b..fae1c22 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -386,3 +386,4 @@ TOOLS = aviocat \ probetest \ $(SUBDIR)output-example$(EXESUF): ELIBS = $(patsubst %,$(LD_LIB),swscale avutil) +$(SUBDIR)output-example$(EXESUF): $(call PATH_LIBNAME,swscale) _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
