[SCM] libav/experimental: build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Aug 10 16:03:07 UTC 2014


The following commit has been merged in the experimental branch:
commit 7e90133f6420b1c53652f972b9561600822881ee
Author: Janne Grunau <janne-libav at jannau.net>
Date:   Wed May 14 00:05:27 2014 +0200

    build: do not append $(FFLIBS-) to $(FFLIBS) if $(NAME) is not defined
    
    Avoids including disabled library Makefiles.

diff --git a/common.mak b/common.mak
index cdcdc8a..c17b5bf 100644
--- a/common.mak
+++ b/common.mak
@@ -8,7 +8,7 @@ all: all-yes
 include $(SRC_PATH)/arch.mak
 
 OBJS      += $(OBJS-yes)
-FFLIBS    := $(FFLIBS-$(NAME)) $(FFLIBS-yes) $(FFLIBS)
+FFLIBS    := $(FFLIBS-$(if $(NAME),$(NAME),no)) $(FFLIBS-yes) $(FFLIBS)
 TESTPROGS += $(TESTPROGS-yes)
 
 LDLIBS       = $(FFLIBS:%=%$(BUILDSUF))

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list