aboutsummaryrefslogtreecommitdiffstats
path: root/library.mak
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-10-15 04:05:03 +0100
committerMans Rullgard <mans@mansr.com>2012-10-23 12:00:22 +0100
commit80521c1997a23e148edf89e11b939ab8646297ca (patch)
treebdaee0989d84e85268fb158868e8874589ca8e23 /library.mak
parenta805cefd8b81e551ab7dfb6a7ae8b5a1512e7893 (diff)
downloadffmpeg-80521c1997a23e148edf89e11b939ab8646297ca.tar.gz
build: allow targets to specify extra objects to link with executables
This allows targets to include special objects when linking executables without including them in (shared) libraries. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'library.mak')
-rw-r--r--library.mak2
1 files changed, 1 insertions, 1 deletions
diff --git a/library.mak b/library.mak
index b36593504c..cbfa0d48e1 100644
--- a/library.mak
+++ b/library.mak
@@ -36,7 +36,7 @@ define RULES
$(EXAMPLES) $(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB))
$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)
-$(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o
+$(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
$$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS)
$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)