build: export library dependencies in ${name}_FFLIBS
authorJanne Grunau <janne-libav@jannau.net>
Thu, 15 May 2014 16:11:19 +0000 (18:11 +0200)
committerJanne Grunau <janne-libav@jannau.net>
Mon, 19 May 2014 22:43:51 +0000 (00:43 +0200)
Removes an ugly $(if) to avoid conflicts with $(FFLIBS-) in the
top-level MAkefile.

common.mak
configure

index c17b5bf..9244fd3 100644 (file)
@@ -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))
index 74a4df1..ccf437f 100755 (executable)
--- a/configure
+++ b/configure
@@ -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"