summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-01-25 13:25:18 +0000
committerMichael Niedermayer <michaelni@gmx.at>2011-01-26 03:43:30 +0100
commit3ae2a7575d6c85de96d7ca8f9918dd5763215c3c (patch)
tree7bf738081c27aebf2b3a15ffb2f007b0874689a0
parent121053b2d62c0dab5d2c681d4d54a2c8da8a4abd (diff)
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 <mans@mansr.com> (cherry picked from commit 3d157bf31f33cf413a6fb04ba69a4015ca0625cb)
-rw-r--r--Makefile6
1 files 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)