From 661ce2899608ab7d67a524e2df23d63efa660c20 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 22 Mar 2009 23:13:21 +0000 Subject: Rename 'tests' target to 'testprogs'. It is too easily confused with the 'test' target and a directory named tests exists. Originally committed as revision 18165 to svn://svn.ffmpeg.org/ffmpeg/trunk --- common.mak | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'common.mak') diff --git a/common.mak b/common.mak index d0dc7bec8e..cc77dc530b 100644 --- a/common.mak +++ b/common.mak @@ -54,20 +54,20 @@ install: install-libs install-headers uninstall: uninstall-libs uninstall-headers -.PHONY: all depend dep *clean install* uninstall* examples tests +.PHONY: all depend dep *clean install* uninstall* examples testprogs endif CFLAGS += $(CFLAGS-yes) OBJS += $(OBJS-yes) FFLIBS := $(FFLIBS-yes) $(FFLIBS) -TESTS += $(TESTS-yes) +TESTPROGS += $(TESTPROGS-yes) FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS) FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS) EXAMPLES := $(addprefix $(SUBDIR),$(EXAMPLES)) OBJS := $(addprefix $(SUBDIR),$(OBJS)) -TESTS := $(addprefix $(SUBDIR),$(TESTS)) +TESTPROGS := $(addprefix $(SUBDIR),$(TESTPROGS)) DEP_LIBS:=$(foreach NAME,$(FFLIBS),lib$(NAME)/$($(BUILD_SHARED:yes=S)LIBNAME)) @@ -98,7 +98,7 @@ $(SUBDIR)x86/%.d: $(SUBDIR)x86/%.asm $(YASM) $(YASMFLAGS) -I $$( $$@ clean:: - rm -f $(EXAMPLES) $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ + rm -f $(EXAMPLES) $(TESTPROGS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \ $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS)))) distclean:: clean @@ -109,6 +109,6 @@ endef $(eval $(RULES)) examples: $(EXAMPLES) -tests: $(TESTS) +testprogs: $(TESTPROGS) -include $(DEPS) -- cgit v1.2.3