[FFmpeg-cvslog] common.mak: fix (not)building disabled libs

Michael Niedermayer git at videolan.org
Tue May 13 22:52:47 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 13 22:15:52 2014 +0200| [efa95968317411179b0016af54745906029c2295] | committer: Michael Niedermayer

common.mak: fix (not)building disabled libs

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efa95968317411179b0016af54745906029c2295
---

 common.mak |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common.mak b/common.mak
index eaa6b47..357d496 100644
--- 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))



More information about the ffmpeg-cvslog mailing list