git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3a6ded7
)
build: fix builds configured with a suffix
author
James Almer
<jamrial@gmail.com>
Thu, 12 Oct 2017 20:32:10 +0000
(17:32 -0300)
committer
James Almer
<jamrial@gmail.com>
Thu, 12 Oct 2017 22:15:42 +0000
(19:15 -0300)
Regression since
6dfcbd80ad446ff163b47f2bf432bbf706436ea8
Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
ffbuild/common.mak
patch
|
blob
|
history
diff --git
a/ffbuild/common.mak
b/ffbuild/common.mak
index
a6b23e0
..
63a3c2f
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 := $(
FF
LIBS:%=$(LD_LIB)) $(foreach lib,EXTRALIBS-$(NAME) $(FFLIBS:%=EXTRALIBS-%),$($(lib))) $(EXTRALIBS)
+FFEXTRALIBS := $(
LD
LIBS:%=$(LD_LIB)) $(foreach lib,EXTRALIBS-$(NAME) $(FFLIBS:%=EXTRALIBS-%),$($(lib))) $(EXTRALIBS)
OBJS := $(sort $(OBJS:%=$(SUBDIR)%))
SLIBOBJS := $(sort $(SLIBOBJS:%=$(SUBDIR)%))