diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2014-05-14 00:05:27 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2014-05-14 09:46:43 +0200 |
| commit | 7e90133f6420b1c53652f972b9561600822881ee (patch) | |
| tree | 5b2581b4fbfc3d6d30d37371c4cd5329ee6f75f4 | |
| parent | a738540366c9b114949b7914c0d08e2c28982cfb (diff) | |
| download | ffmpeg-7e90133f6420b1c53652f972b9561600822881ee.tar.gz | |
build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined
Avoids including disabled library Makefiles.
| -rw-r--r-- | common.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common.mak b/common.mak index cdcdc8a149..c17b5bfab9 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)) |