Commit 9e6769d2 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'afe17626'

* commit 'afe17626':
  build: export library dependencies in ${name}_FFLIBS

Conflicts:
	common.mak
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 447b988b afe17626
......@@ -93,7 +93,7 @@ include $(SRC_PATH)/arch.mak
OBJS += $(OBJS-yes)
SLIBOBJS += $(SLIBOBJS-yes)
FFLIBS := $(FFLIBS-$(if $(NAME),$(NAME),no)) $(FFLIBS-yes) $(FFLIBS)
FFLIBS := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS)
TESTPROGS += $(TESTPROGS-yes)
LDLIBS = $(FFLIBS:%=%$(BUILDSUF))
......
......@@ -5396,7 +5396,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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment