(cherry picked from commit 47b6cfc2a0333fb24f074d27830bf35ae5007050) Signed-off-by: Diego Biurrun <[email protected]> (cherry picked from commit b5cacdb3e12927c63084d26d4c7d9d43ed00dd66) 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 9193455..659ec44 100644 --- a/common.mak +++ b/common.mak @@ -23,7 +23,8 @@ TOOLS += $(TOOLS-yes) TOOLOBJS := $(TOOLS:%=tools/%.o) TOOLS := $(TOOLS:%=tools/%$(EXESUF)) -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 744ccb7..c70f1a1 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -357,3 +357,4 @@ TESTPROGS = seek TOOLS = aviocat pktdumper probetest $(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale -lavutil +$(SUBDIR)output-example$(EXESUF): $(call PATH_LIBNAME,swscale) -- 2.7.3 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
