[FFmpeg-cvslog] build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined

[Janne Grunau]

ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Wed May 14 00:05:27 2014 +0200| [7e90133f6420b1c53652f972b9561600822881ee] | committer: Janne Grunau

build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined

Avoids including disabled library Makefiles.

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

 common.mak |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.mak b/common.mak
index cdcdc8a..c17b5bf 100644
--- a/common.mak
+++ b/common.mak
@@ -8,7 +8,7 @@ all: all-yes
 include $(SRC_PATH)/arch.mak
 
 OBJS      += $(OBJS-yes)
-FFLIBS    := $(FFLIBS-$(NAME)) $(FFLIBS-yes) $(FFLIBS)
+FFLIBS    := $(FFLIBS-$(if $(NAME),$(NAME),no)) $(FFLIBS-yes) $(FFLIBS)
 TESTPROGS += $(TESTPROGS-yes)
 
 LDLIBS       = $(FFLIBS:%=%$(BUILDSUF))