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:
3d7218d
)
common.mak: fix (not)building disabled libs
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 13 May 2014 20:15:52 +0000
(22:15 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 13 May 2014 20:40:45 +0000
(22:40 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
common.mak
patch
|
blob
|
history
diff --git
a/common.mak
b/common.mak
index
eaa6b47
..
357d496
100644
(file)
--- a/
common.mak
+++ b/
common.mak
@@
-93,7
+93,10
@@
include $(SRC_PATH)/arch.mak
OBJS += $(OBJS-yes)
SLIBOBJS += $(SLIBOBJS-yes)
-FFLIBS := $(FFLIBS-$(NAME)) $(FFLIBS-yes) $(FFLIBS)
+FFLIBS := $(FFLIBS-yes) $(FFLIBS)
+ifdef NAME
+FFLIBS := $(FFLIBS-$(NAME)) $(FFLIBS)
+endif
TESTPROGS += $(TESTPROGS-yes)
LDLIBS = $(FFLIBS:%=%$(BUILDSUF))