diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-03-26 10:12:21 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-03-26 10:12:21 +0000 |
| commit | 3344cf851c55d80080ec8f47bb1637200619ed5f (patch) | |
| tree | 9149c40c1845d2a703c12375c9ecf8f48eac9444 | |
| parent | d4efacff64f8b07c24eabb38f855ff06a10dcc31 (diff) | |
| download | ffmpeg-3344cf851c55d80080ec8f47bb1637200619ed5f.tar.gz | |
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
| -rw-r--r-- | common.mak | 2 | ||||
| -rw-r--r-- | libavutil/Makefile | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/common.mak b/common.mak index d004de4e01..83f2dbb1ca 100644 --- 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 51c50f4992..8428446b02 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) |