Use a wildcard match instead of a list to remove test programs.

This is robust against renames and also removes test programs not
(yet) hooked up in the main Makefiles.

Originally committed as revision 18193 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/common.mak b/common.mak
index d004de4..83f2dbb 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -98,7 +98,7 @@ $(SUBDIR)x86/%.d: $(SUBDIR)x86/%.asm
        $(YASM) $(YASMFLAGS) -I $$(<D)/ -M -o $$(@:%.d=%.o) $$< > $$@
 
 clean::
-       rm -f $(EXAMPLES) $(TESTPROGS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
+       rm -f $(EXAMPLES) $(addprefix $(SUBDIR),*-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
            $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
 
 distclean:: clean

diff --git a/libavutil/Makefile b/libavutil/Makefile
index 51c50f4..8428446 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -48,5 +48,3 @@ DIRS = arm bfin sh4 x86
 include $(SUBDIR)../subdir.mak
 
 $(SUBDIR)lzo-test$(EXESUF): EXTRALIBS += -llzo2
-
-CLEANFILES = lzo-test$(EXESUF)