[FFmpeg-cvslog] Makefile: fix cleaning of tools in tests directory
Mans Rullgard
git
Wed Jan 26 04:01:17 CET 2011
ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Tue Jan 25 13:25:18 2011 +0000| [3ae2a7575d6c85de96d7ca8f9918dd5763215c3c] | committer: Michael Niedermayer
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 at mansr.com>
(cherry picked from commit 3d157bf31f33cf413a6fb04ba69a4015ca0625cb)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ae2a7575d6c85de96d7ca8f9918dd5763215c3c
---
Makefile | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 2fe605a..c5e74f0 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)
More information about the ffmpeg-cvslog
mailing list