[FFmpeg-cvslog] r12800 - in trunk: common.mak libavcodec/Makefile

[diego]

Author: diego
Date: Sun Apr 13 12:09:47 2008
New Revision: 12800

Log:
Generate the list of files to clean in subdirectories in common.mak.
This way, it can be used from all directories.


Modified:
   trunk/common.mak
   trunk/libavcodec/Makefile

Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Sun Apr 13 12:09:47 2008
@@ -76,7 +76,8 @@ $(SUBDIR)%-test$(EXESUF): $(SUBDIR)%.c $
 	$(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)

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Sun Apr 13 12:09:47 2008
@@ -467,11 +467,9 @@ ASM_OBJS-$(ARCH_BFIN)                  +
 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