From 3ae0e721c7b6e0483801b9039b3d140e3b68b7f5 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Tue, 21 Jul 2015 23:22:42 +0200 Subject: [PATCH] checkasm: Always link statically Checkasm needs to use internal symbols that should not be made public. --- Makefile | 1 + common.mak | 5 +++-- tests/checkasm/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5807acd562..e9a95aaec4 100644 --- a/Makefile +++ b/Makefile @@ -100,6 +100,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 9244fd366d..adab9d17bb 100644 --- a/common.mak +++ b/common.mak @@ -24,8 +24,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 483ad136f0..9498ebfc7f 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)