diff options
author | Janne Grunau <janne-libav@jannau.net> | 2014-05-15 20:11:19 +0400 |
---|---|---|
committer | Janne Grunau <janne-libav@jannau.net> | 2014-05-20 02:43:51 +0400 |
commit | afe176265480880e1f702c96a8ba434b0d88728b (patch) | |
tree | 04e0a5b592edc03bd00a2dc06a0305bfc23061b6 | |
parent | 132a5711a2aaaa6c7d139a0a30046a6ad41b64aa (diff) |
build: export library dependencies in ${name}_FFLIBS
Removes an ugly $(if) to avoid conflicts with $(FFLIBS-) in the
top-level MAkefile.
-rw-r--r-- | common.mak | 2 | ||||
-rwxr-xr-x | configure | 2 |
2 files changed, 2 insertions, 2 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)) @@ -4604,7 +4604,7 @@ get_version(){ map 'get_version $v' $LIBRARY_LIST -map 'eval echo "FFLIBS-${v}=\$${v}_deps" >> config.mak' $LIBRARY_LIST +map 'eval echo "${v}_FFLIBS=\$${v}_deps" >> config.mak' $LIBRARY_LIST print_program_libs(){ eval "program_libs=\$${1}_libs" |