Merge commit 'c380a0d7f7a2c7411aae60463e25d916541f0388'

[ffmpeg] / ffbuild / common.mak

diff --git a/ffbuild/common.mak b/ffbuild/common.mak
index e168fb2cfdde56bd91c0e882d3eb4ce12b7f9c98..63a3c2f2d0ae875dbbfd4f9857eb3a28a7dadbf9 100644 (file)
--- 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 := $(LDLIBS:%=$(LD_LIB)) $(foreach lib,EXTRALIBS-$(NAME) $(FFLIBS:%=EXTRALIBS-%),$($(lib))) $(EXTRALIBS)
 
 OBJS      := $(sort $(OBJS:%=$(SUBDIR)%))
 SLIBOBJS  := $(sort $(SLIBOBJS:%=$(SUBDIR)%))