Commit afe17626 authored by Janne Grunau's avatar Janne Grunau

build: export library dependencies in ${name}_FFLIBS

Removes an ugly $(if) to avoid conflicts with $(FFLIBS-) in the
top-level MAkefile.
parent 132a5711
...@@ -8,7 +8,7 @@ all: all-yes ...@@ -8,7 +8,7 @@ all: all-yes
include $(SRC_PATH)/arch.mak include $(SRC_PATH)/arch.mak
OBJS += $(OBJS-yes) OBJS += $(OBJS-yes)
FFLIBS := $(FFLIBS-$(if $(NAME),$(NAME),no)) $(FFLIBS-yes) $(FFLIBS) FFLIBS := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS)
TESTPROGS += $(TESTPROGS-yes) TESTPROGS += $(TESTPROGS-yes)
LDLIBS = $(FFLIBS:%=%$(BUILDSUF)) LDLIBS = $(FFLIBS:%=%$(BUILDSUF))
......
...@@ -4604,7 +4604,7 @@ get_version(){ ...@@ -4604,7 +4604,7 @@ get_version(){
map 'get_version $v' $LIBRARY_LIST 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(){ print_program_libs(){
eval "program_libs=\$${1}_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