From d094258f810ff0dcc9c6303ba56fda98b8c7edec Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Thu, 20 Jan 2011 02:04:19 +0000 Subject: [PATCH] Makefile: simplify setting of some variables Signed-off-by: Mans Rullgard (cherry picked from commit 583fcb528cb13b271860529a464abc6304e063e3) --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index d158507b5f..98ec5f5b47 100644 --- a/Makefile +++ b/Makefile @@ -9,20 +9,20 @@ PROGS-$(CONFIG_FFPLAY) += ffplay PROGS-$(CONFIG_FFPROBE) += ffprobe PROGS-$(CONFIG_FFSERVER) += ffserver -PROGS := $(addsuffix $(EXESUF), $(PROGS-yes)) -PROGS_G = $(addsuffix _g$(EXESUF), $(PROGS-yes)) -OBJS = $(addsuffix .o, $(PROGS-yes)) cmdutils.o -MANPAGES = $(addprefix doc/, $(addsuffix .1, $(PROGS-yes))) -PODPAGES = $(addprefix doc/, $(addsuffix .pod, $(PROGS-yes))) -HTMLPAGES = $(addprefix doc/, $(addsuffix .html, $(PROGS-yes))) +PROGS := $(PROGS-yes:%=%$(EXESUF)) +PROGS_G = $(PROGS-yes:%=%_g$(EXESUF)) +OBJS = $(PROGS-yes:%=%.o) cmdutils.o +MANPAGES = $(PROGS-yes:%=doc/%.1) +PODPAGES = $(PROGS-yes:%=doc/%.pod) +HTMLPAGES = $(PROGS-yes:%=doc/%.html) TOOLS = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws pktdumper probetest qt-faststart trasher)) HOSTPROGS = $(addprefix tests/, audiogen videogen rotozoom tiny_psnr base64) BASENAMES = ffmpeg ffplay ffprobe ffserver -ALLPROGS = $(addsuffix $(EXESUF), $(BASENAMES)) -ALLPROGS_G = $(addsuffix _g$(EXESUF), $(BASENAMES)) -ALLMANPAGES = $(addsuffix .1, $(BASENAMES)) -ALLHTMLPAGES= $(addsuffix .html, $(BASENAMES)) +ALLPROGS = $(BASENAMES:%=%$(EXESUF)) +ALLPROGS_G = $(BASENAMES:%=_g$(EXESUF)) +ALLMANPAGES = $(BASENAMES:%=%.1) +ALLHTMLPAGES= $(BASENAMES:%=%.html) FFLIBS-$(CONFIG_AVDEVICE) += avdevice FFLIBS-$(CONFIG_AVFILTER) += avfilter