diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-22 16:30:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-22 16:30:37 +0200 |
| commit | c1692439e081dcc259489a1c2ddc2a659870dce6 (patch) | |
| tree | 8dd147f4277f59305cb82b6ca3cfbacb3dcaba8e | |
| parent | c7e6443441ed5c1b5f64067dfbf4956bc2c6acbb (diff) | |
| parent | 3ae0e721c7b6e0483801b9039b3d140e3b68b7f5 (diff) | |
| download | ffmpeg-c1692439e081dcc259489a1c2ddc2a659870dce6.tar.gz | |
Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5'
* commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5':
checkasm: Always link statically
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | common.mak | 5 | ||||
| -rw-r--r-- | tests/checkasm/Makefile | 4 |
3 files changed, 6 insertions, 4 deletions
@@ -60,6 +60,7 @@ include $(SRC_PATH)/common.mak FF_EXTRALIBS := $(FFEXTRALIBS) FF_DEP_LIBS := $(DEP_LIBS) +FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS) all: $(AVPROGS) diff --git a/common.mak b/common.mak index eac8bd9937..7569d35bb1 100644 --- a/common.mak +++ b/common.mak @@ -118,8 +118,9 @@ TOOLOBJS := $(TOOLS:%=tools/%.o) TOOLS := $(TOOLS:%=tools/%$(EXESUF)) HEADERS += $(HEADERS-yes) -PATH_LIBNAME = $(foreach NAME,$(1),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME)) -DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib))) +PATH_LIBNAME = $(foreach NAME,$(1),lib$(NAME)/$($(2)LIBNAME)) +DEP_LIBS := $(foreach lib,$(FFLIBS),$(call PATH_LIBNAME,$(lib),$(CONFIG_SHARED:yes=S))) +STATIC_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/tests/checkasm/Makefile b/tests/checkasm/Makefile index 4c0ffab884..909f2f00ad 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -22,8 +22,8 @@ tests/checkasm/%.o: CFLAGS := $(CFLAGS:-Wstrict-prototypes=-Wno-strict-prototype CHECKASM := tests/checkasm/checkasm$(EXESUF) -$(CHECKASM): $(EXEOBJS) $(CHECKASMOBJS) $(FF_DEP_LIBS) - $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(CHECKASMOBJS) $(FF_EXTRALIBS) +$(CHECKASM): $(EXEOBJS) $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS) + $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS) $(EXTRALIBS) checkasm: $(CHECKASM) |