From 3344cf851c55d80080ec8f47bb1637200619ed5f Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 26 Mar 2009 10:12:21 +0000 Subject: [PATCH] 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 --- common.mak | 2 +- libavutil/Makefile | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/common.mak b/common.mak index d004de4..83f2dbb 100644 --- a/common.mak +++ b/common.mak @@ -98,7 +98,7 @@ $(SUBDIR)x86/%.d: $(SUBDIR)x86/%.asm $(YASM) $(YASMFLAGS) -I $$( $$@ 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 --- 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) -- 2.7.4