build: export library dependencies in ${name}_FFLIBS

Removes an ugly $(if) to avoid conflicts with $(FFLIBS-) in the
top-level MAkefile.
pull/68/head^2
Janne Grunau 11 years ago
parent 132a5711a2
commit afe1762654
  1. 2
      common.mak
  2. 2
      configure

@ -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))

2
configure vendored

@ -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"

Loading…
Cancel
Save