Merge commit '7e90133f'

* commit '7e90133f':
  build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined

Conflicts:
	common.mak

See: efa95968Merged-by: NMichael Niedermayer <michaelni@gmx.at>

common.mak

@@ -93,10 +93,7 @@ include $(SRC_PATH)/arch.mak
 
 OBJS      += $(OBJS-yes)
 SLIBOBJS  += $(SLIBOBJS-yes)
-FFLIBS    := $(FFLIBS-yes) $(FFLIBS)
-ifdef NAME
-FFLIBS    := $(FFLIBS-$(NAME)) $(FFLIBS)
-endif
+FFLIBS    := $(FFLIBS-$(if $(NAME),$(NAME),no)) $(FFLIBS-yes) $(FFLIBS)
 TESTPROGS += $(TESTPROGS-yes)
 
 LDLIBS       = $(FFLIBS:%=%$(BUILDSUF))