aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-04-13 10:09:47 +0000
committerDiego Biurrun <diego@biurrun.de>2008-04-13 10:09:47 +0000
commitadc393503fa001c0f3d72bc859d4a75e34f48a6c (patch)
tree5e94815cfc00659d49b32f6b48bb27e3d22e25ae
parentd4210e2a4b3ffd258ba6fa193116d2b8bf275832 (diff)
downloadffmpeg-adc393503fa001c0f3d72bc859d4a75e34f48a6c.tar.gz
Generate the list of files to clean in subdirectories in common.mak.
This way, it can be used from all directories. Originally committed as revision 12800 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--common.mak3
-rw-r--r--libavcodec/Makefile4
2 files changed, 3 insertions, 4 deletions
diff --git a/common.mak b/common.mak
index 12f91066b6..a7d41048ae 100644
--- a/common.mak
+++ b/common.mak
@@ -76,7 +76,8 @@ $(SUBDIR)%-test$(EXESUF): $(SUBDIR)%.c $(LIBNAME)
$(CC) $(CFLAGS) $(FFLDFLAGS) -DTEST -o $$@ $$^ $(FFEXTRALIBS)
clean::
- rm -f $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES))
+ rm -f $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
+ $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
distclean:: clean
rm -f $(DEPS)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 9bde81bf5b..a9858d79aa 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -467,11 +467,9 @@ ASM_OBJS-$(ARCH_BFIN) += bfin/pixels_bfin.o \
TESTS = $(addsuffix -test$(EXESUF), cabac dct eval fft h264 imgresample rangecoder snow)
TESTS-$(ARCH_X86) += cpuid-test$(EXESUF) motion-test$(EXESUF)
+CLEANFILES = apiexample$(EXESUF)
DIRS = alpha armv4l bfin i386 mlib ppc ps2 sh4 sparc
-CLEANFILES = $(addsuffix /*.o,$(DIRS)) $(addsuffix /*.ho,$(DIRS)) \
- $(addsuffix /*~,$(DIRS)) apiexample$(EXESUF)
-
include $(SUBDIR)../subdir.mak
$(SUBDIR)cpuid-test$(EXESUF): $(SUBDIR)i386/cputest.c