summaryrefslogtreecommitdiff
path: root/common.mak
diff options
context:
space:
mode:
authorJanne Grunau <janne-libav@jannau.net>2014-05-15 18:11:19 +0200
committerJanne Grunau <janne-libav@jannau.net>2014-05-20 00:43:51 +0200
commitafe176265480880e1f702c96a8ba434b0d88728b (patch)
tree04e0a5b592edc03bd00a2dc06a0305bfc23061b6 /common.mak
parent132a5711a2aaaa6c7d139a0a30046a6ad41b64aa (diff)
downloadffmpeg-afe176265480880e1f702c96a8ba434b0d88728b.tar.gz
build: export library dependencies in ${name}_FFLIBS
Removes an ugly $(if) to avoid conflicts with $(FFLIBS-) in the top-level MAkefile.
Diffstat (limited to 'common.mak')
-rw-r--r--common.mak2
1 files changed, 1 insertions, 1 deletions
diff --git a/common.mak b/common.mak
index c17b5bfab9..9244fd366d 100644
--- a/common.mak
+++ b/common.mak
@@ -8,7 +8,7 @@ all: all-yes
include $(SRC_PATH)/arch.mak
OBJS += $(OBJS-yes)
-FFLIBS := $(FFLIBS-$(if $(NAME),$(NAME),no)) $(FFLIBS-yes) $(FFLIBS)
+FFLIBS := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS)
TESTPROGS += $(TESTPROGS-yes)
LDLIBS = $(FFLIBS:%=%$(BUILDSUF))