From 7304c2c4ce195a9eace8c578c138128e5768b4d7 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 25 Mar 2009 18:19:20 +0000 Subject: [PATCH] Move adding the '-test$(EXESUF)' suffix to test programs into common.mak. Originally committed as revision 18189 to svn://svn.ffmpeg.org/ffmpeg/trunk --- common.mak | 2 +- libavcodec/Makefile | 6 +++--- libavformat/Makefile | 2 +- libavutil/Makefile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common.mak b/common.mak index 0b86611a8c..d004de4e01 100644 --- a/common.mak +++ b/common.mak @@ -67,7 +67,7 @@ FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS) EXAMPLES := $(addprefix $(SUBDIR),$(EXAMPLES)) OBJS := $(addprefix $(SUBDIR),$(OBJS)) -TESTPROGS := $(addprefix $(SUBDIR),$(TESTPROGS)) +TESTPROGS := $(addprefix $(SUBDIR),$(addsuffix -test$(EXESUF),$(TESTPROGS))) DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME)) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 4bb617954a..037a89b299 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -533,9 +533,9 @@ OBJS-$(HAVE_VIS) += sparc/dsputil_vis.o \ EXAMPLES = apiexample$(EXESUF) -TESTPROGS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 rangecoder snow) -TESTPROGS-$(ARCH_X86) += x86/cpuid-test$(EXESUF) -TESTPROGS-$(HAVE_MMX) += motion-test$(EXESUF) +TESTPROGS = cabac dct eval fft h264 rangecoder snow +TESTPROGS-$(ARCH_X86) += x86/cpuid +TESTPROGS-$(HAVE_MMX) += motion DIRS = alpha arm bfin mlib ppc ps2 sh4 sparc x86 diff --git a/libavformat/Makefile b/libavformat/Makefile index 600832246e..579c7bcceb 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -243,6 +243,6 @@ OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o -TESTPROGS = $(addsuffix -test$(EXESUF), timefilter) +TESTPROGS = timefilter include $(SUBDIR)../subdir.mak diff --git a/libavutil/Makefile b/libavutil/Makefile index aa54c9383d..51c50f4992 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -41,7 +41,7 @@ OBJS = adler32.o \ tree.o \ utils.o \ -TESTPROGS = $(addsuffix -test$(EXESUF), adler32 aes base64 crc des lls md5 pca sha1 softfloat tree) +TESTPROGS = adler32 aes base64 crc des lls md5 pca sha1 softfloat tree DIRS = arm bfin sh4 x86