summaryrefslogtreecommitdiff
path: root/library.mak
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-10-10 03:24:50 +0100
committerMans Rullgard <mans@mansr.com>2012-10-10 11:24:09 +0100
commit4b895cb294d610fb3bf9e57385e665488e8a9ffa (patch)
treeb73cc9b7e2a09d7b1f5f6af5ba9362c7d773c40f /library.mak
parent096a5d76a547b65f027a3b981895e6fabe521818 (diff)
build: sanitize linking of tools and test programs
This makes sure proper linker arguments are used for the tools and test programs when shared libraries are enabled. The tools are linked using the usual -l flag while for test programs the full name of the static library is used. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'library.mak')
-rw-r--r--library.mak5
1 files changed, 4 insertions, 1 deletions
diff --git a/library.mak b/library.mak
index 7b78e59577..98e0c6f912 100644
--- a/library.mak
+++ b/library.mak
@@ -34,8 +34,11 @@ install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static
install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared
define RULES
+$(EXAMPLES) $(TOOLS): LIB = $(FULLNAME:%=$(LD_LIB))
+$(TESTPROGS): LIB = $(SUBDIR)$(LIBNAME)
+
$(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o
- $$(LD) $(LDFLAGS) $$(LD_O) $$^ $(FFEXTRALIBS) $$(ELIBS)
+ $$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(LIB) $(FFEXTRALIBS) $$(ELIBS)
$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)