summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2017-01-22 16:42:36 +0100
committerDiego Biurrun <diego@biurrun.de>2017-03-01 09:00:40 +0100
commit7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63 (patch)
treeb20e60da36d23393800e832069148484ee245a86 /Makefile
parentd154bdd3d053128c908a994bb26e14bbc17f0e53 (diff)
downloadffmpeg-streaming-7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63.zip
ffmpeg-streaming-7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63.tar.gz
build: Fine-grained link-time dependency settings
Previously, all link-time dependencies were added for all libraries, resulting in bogus link-time dependencies since not all dependencies are shared across libraries. Also, in some cases like libavutil, not all dependencies were taken into account, resulting in some cases of underlinking. To address all this mess a machinery is added for tracking which dependency belongs to which library component and then leveraged to determine correct dependencies for all individual libraries.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a3cd084..80d50d8 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ FF_DEP_LIBS := $(DEP_LIBS)
FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS)
$(TOOLS): %$(EXESUF): %.o
- $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(EXTRALIBS) $(ELIBS)
+ $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(EXTRALIBS-$(*F)) $(EXTRALIBS) $(ELIBS)
CONFIGURABLE_COMPONENTS = \
$(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) \
OpenPOWER on IntegriCloud