diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-11 17:55:25 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-11 17:55:25 -0300 |
| commit | 6dfcbd80ad446ff163b47f2bf432bbf706436ea8 (patch) | |
| tree | 0ec563538452a051d17f3fbc97bbcb4464863535 /Makefile | |
| parent | 58143b15adda6391ec07f3eb19e80ed91d801edd (diff) | |
| parent | 7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63 (diff) | |
| download | ffmpeg-6dfcbd80ad446ff163b47f2bf432bbf706436ea8.tar.gz | |
Merge commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63'
* commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63':
build: Fine-grained link-time dependency settings
Also included are bug fix commits 5ff3b5cafcc685b6936d16602b0f80aa09a95870,
d9da7151eef7fc469787e7298196cea291acfd82 and
5e27ef800bfa2be17a6353ddedac6b7400e4624f.
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -45,12 +45,11 @@ FF_DEP_LIBS := $(DEP_LIBS) FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS) $(TOOLS): %$(EXESUF): %.o - $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) + $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(EXTRALIBS-$(*F)) $(EXTRALIBS) $(ELIBS) target_dec_%_fuzzer$(EXESUF): target_dec_%_fuzzer.o $(FF_DEP_LIBS) $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS) $(FF_EXTRALIBS) $(LIBFUZZER_PATH) -tools/cws2fws$(EXESUF): ELIBS = $(ZLIB) tools/sofa2wavs$(EXESUF): ELIBS = $(FF_EXTRALIBS) tools/uncoded_frame$(EXESUF): $(FF_DEP_LIBS) tools/uncoded_frame$(EXESUF): ELIBS = $(FF_EXTRALIBS) |