Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 20 May 2014 01:33:30 +0000 (03:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 20 May 2014 01:33:30 +0000 (03:33 +0200)
* commit 'afe176265480880e1f702c96a8ba434b0d88728b':
  build: export library dependencies in ${name}_FFLIBS

Conflicts:
common.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
common.mak
configure

diff --cc common.mak
@@@ -92,8 -8,7 +92,8 @@@ endi
  include $(SRC_PATH)/arch.mak
  
  OBJS      += $(OBJS-yes)
- FFLIBS    := $(FFLIBS-$(if $(NAME),$(NAME),no)) $(FFLIBS-yes) $(FFLIBS)
 +SLIBOBJS  += $(SLIBOBJS-yes)
+ FFLIBS    := $($(NAME)_FFLIBS) $(FFLIBS-yes) $(FFLIBS)
  TESTPROGS += $(TESTPROGS-yes)
  
  LDLIBS       = $(FFLIBS:%=%$(BUILDSUF))
diff --cc configure
Simple merge