diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-10-01 13:34:02 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-10-03 23:23:04 +0200 |
| commit | 47b6cfc2a0333fb24f074d27830bf35ae5007050 (patch) | |
| tree | 09ecef053681c06f1040c296b9eb4d04b2bd7f41 | |
| parent | 80fefbed623491b92fe59ead99225f99c0d0ca08 (diff) | |
avformat/output-example: Declare link dependency on libswscale in the Makefile
| -rw-r--r-- | common.mak | 3 | ||||
| -rw-r--r-- | libavformat/Makefile | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/common.mak b/common.mak index a1d9d1e502..41ef235db7 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 231e127228..f12b493a88 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) |