From 3d157bf31f33cf413a6fb04ba69a4015ca0625cb Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Tue, 25 Jan 2011 13:25:18 +0000 Subject: [PATCH] Makefile: fix cleaning of tools in tests directory The variable TESTPROGS is reset by the library makefiles, use another name. Signed-off-by: Mans Rullgard --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2fe605ae66..c5e74f062c 100644 --- a/Makefile +++ b/Makefile @@ -16,8 +16,8 @@ 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)) -TESTPROGS = audiogen videogen rotozoom tiny_psnr base64 -HOSTPROGS := $(TESTPROGS:%=tests/%) +TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64 +HOSTPROGS := $(TESTTOOLS:%=tests/%) BASENAMES = ffmpeg ffplay ffprobe ffserver ALLPROGS = $(BASENAMES:%=%$(EXESUF)) @@ -163,7 +163,7 @@ testclean: $(RM) -r tests/vsynth1 tests/vsynth2 tests/data $(RM) $(addprefix tests/,$(CLEANSUFFIXES)) $(RM) tests/seek_test$(EXESUF) tests/seek_test.o - $(RM) $(TESTPROGS:%=tests/%$(HOSTEXESUF)) + $(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF)) clean:: testclean $(RM) $(ALLPROGS) $(ALLPROGS_G)