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 /ffbuild | |
| 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 'ffbuild')
| -rw-r--r-- | ffbuild/common.mak | 2 | ||||
| -rw-r--r-- | ffbuild/library.mak | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ffbuild/common.mak b/ffbuild/common.mak index e168fb2cfd..a6b23e029f 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -119,7 +119,7 @@ FFLIBS := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS) TESTPROGS += $(TESTPROGS-yes) LDLIBS = $(FFLIBS:%=%$(BUILDSUF)) -FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(EXTRALIBS) +FFEXTRALIBS := $(FFLIBS:%=$(LD_LIB)) $(foreach lib,EXTRALIBS-$(NAME) $(FFLIBS:%=EXTRALIBS-%),$($(lib))) $(EXTRALIBS) OBJS := $(sort $(OBJS:%=$(SUBDIR)%)) SLIBOBJS := $(sort $(SLIBOBJS:%=$(SUBDIR)%)) diff --git a/ffbuild/library.mak b/ffbuild/library.mak index 4191edcf9c..430da3f72a 100644 --- a/ffbuild/library.mak +++ b/ffbuild/library.mak @@ -32,7 +32,7 @@ $(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB)) $(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o - $$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS) + $$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(EXTRALIBS-$$(*F)) $$(ELIBS) $(SUBDIR)lib$(NAME).version: $(SUBDIR)version.h | $(SUBDIR) $$(M) $$(SRC_PATH)/ffbuild/libversion.sh $(NAME) $$< > $$@ |