Merge commit '7e90133f6420b1c53652f972b9561600822881ee'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 May 2014 12:02:19 +0000 (14:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 May 2014 12:02:19 +0000 (14:02 +0200)
* commit '7e90133f6420b1c53652f972b9561600822881ee':
  build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined

Conflicts:
common.mak

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

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