typo

[ffmpeg] / common.mak

diff --git a/common.mak b/common.mak
index d87de3e1f705b56d5d1d57472bc832a093729a8c..1fbdf2b489e68a175c78b2037f338dc64a14e04e 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -65,8 +65,9 @@ checkheaders: $(filter-out %_template.ho,$(ALLHEADERS:.h=.ho))
 DEPS := $(OBJS:.o=.d)
 depend dep: $(DEPS)
 
-CLEANFILES += *.o *~ *.a *.lib *.so *.so.* *.dylib *.dll \
-              *.def *.dll.a *.exp *.ho *.map
+CLEANSUFFIXES = *.o *~ *.ho
+LIBSUFFIXES   = *.a *.lib *.so *.so.* *.dylib *.dll *.def *.dll.a *.exp *.map
+DISTCLEANSUFFIXES = *.d
 
 define RULES
 $(SUBDIR)%: $(SUBDIR)%.o $(LIBNAME)
@@ -76,14 +77,19 @@ $(SUBDIR)%-test$(EXESUF): $(SUBDIR)%.c $(LIBNAME)
        $(CC) $(CFLAGS) $(FFLDFLAGS) -DTEST -o $$@ $$^ $(FFEXTRALIBS)
 
 clean::
-       rm -f $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES))
+       rm -f $(TESTS) $(addprefix $(SUBDIR),$(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
+           $(addprefix $(SUBDIR), $(foreach suffix,$(CLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
 
 distclean:: clean
-       rm -f $(DEPS)
+       rm -f  $(addprefix $(SUBDIR),$(DISTCLEANSUFFIXES)) \
+            $(addprefix $(SUBDIR), $(foreach suffix,$(DISTCLEANSUFFIXES),$(addsuffix /$(suffix),$(DIRS))))
 endef
 
 $(eval $(RULES))
 
+# Clear DIRS variable so that it is not used in other subdirectories.
+DIRS =
+
 tests: $(TESTS)
 
 -include $(DEPS)