[FFmpeg-cvslog] avformat/output-example: Declare link dependency on libswscale in the Makefile

Diego Biurrun git at videolan.org
Fri Oct 4 11:54:24 CEST 2013


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Oct  1 13:34:02 2013 +0200| [47b6cfc2a0333fb24f074d27830bf35ae5007050] | committer: Diego Biurrun

avformat/output-example: Declare link dependency on libswscale in the Makefile

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47b6cfc2a0333fb24f074d27830bf35ae5007050
---

 common.mak           |    3 ++-
 libavformat/Makefile |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/common.mak b/common.mak
index a1d9d1e..41ef235 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)))
 
 SRC_DIR    := $(SRC_PATH)/lib$(NAME)
 ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 231e127..f12b493 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -400,3 +400,4 @@ TOOLS     = aviocat                                                     \
             probetest                                                   \
 
 $(SUBDIR)output-example$(EXESUF): ELIBS = $(patsubst %,$(LD_LIB),swscale avutil)
+$(SUBDIR)output-example$(EXESUF): $(call PATH_LIBNAME,swscale)



More information about the ffmpeg-cvslog mailing list