Make clean/distclean consistent throughout all the Makefiles.

Originally committed as revision 4863 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index 8d9c223..ae3dcd8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,6 @@ endif
 ifeq ($(BUILD_VHOOK),yes)
 VHOOK=videohook
 INSTALLVHOOK=install-vhook
-CLEANVHOOK=clean-vhook
 endif
 
 ifeq ($(TARGET_OS), SunOS)
@@ -151,21 +150,23 @@ endif
        @test -f .libs || touch .libs
        @for i in $(DEP_LIBS) ; do if $(TEST) $$i -nt .libs ; then touch .libs; fi ; done
 
-clean: $(CLEANVHOOK)
+clean:
        $(MAKE) -C libavutil clean
        $(MAKE) -C libavcodec clean
        $(MAKE) -C libavformat clean
        $(MAKE) -C tests clean
-       rm -f *.o *.d *~ .libs .depend gmon.out TAGS ffmpeg_g$(EXESUF) \
-          ffplay_g$(EXESUF) $(PROG) $(PROGTEST) $(QTFASTSTART)
-
-clean-vhook:
        $(MAKE) -C vhook clean
+       rm -f *.o *.d *~ .libs gmon.out TAGS \
+          $(PROG) $(PROGTEST) $(QTFASTSTART)
 
 # Note well: config.log is NOT removed.
 distclean: clean
-       $(MAKE) -C libavcodec distclean
-       rm -f config.mak config.h *.pc
+       $(MAKE) -C libavutil   distclean
+       $(MAKE) -C libavcodec  distclean
+       $(MAKE) -C libavformat distclean
+       $(MAKE) -C tests       distclean
+       $(MAKE) -C vhook       distclean
+       rm -f Makefile.bak .depend config.mak config.h *.pc
 
 TAGS:
        etags *.[ch] libavformat/*.[ch] libavcodec/*.[ch]

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 81a6d13..46258e8 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -444,8 +444,8 @@ depend: $(SRCS)
 dep:   depend
 
 clean: $(CLEANAMR)
-       rm -f *.o *.d *~ i386/*.o i386/*~ \
-          *.a *.lib *.so *.dylib *.dll \
+       rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll \
+          i386/*.o i386/*~ \
           armv4l/*.o armv4l/*~ \
           mlib/*.o mlib/*~ \
           alpha/*.o alpha/*~ \
@@ -459,6 +459,7 @@ clean: $(CLEANAMR)
 
 distclean: clean
        rm -f Makefile.bak .depend
+       $(MAKE) -C libpostproc distclean
 
 cleanamr:
        $(MAKE) -C amr clean

diff --git a/libavformat/Makefile b/libavformat/Makefile
index b88c90f..947a93a 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -142,8 +142,11 @@ install-headers:
 %.o: %.cpp
        g++ $(subst -Wall,,$(CFLAGS)) -c -o $@ $<
 
-distclean clean:
-       rm -f *.o *.d *~ .depend *.a *.lib *.so *.dylib *.dll
+clean:
+       rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
+
+distclean: clean
+       rm -f Makefile.bak .depend
 
 #
 # include dependency files if they exist

diff --git a/tests/Makefile b/tests/Makefile
index 4bcad53..08b0d59 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -72,6 +72,6 @@ dsptestpic: dsptest.c $(DSPDEPS)
 dsptest: dsptest.c $(DSPDEPS)
        $(CC) -O4 -fomit-frame-pointer -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavcodec/i386 -I$(SRC_PATH)/libavcodec/ -o $@ $< -lm
 
-clean:
+distclean clean:
        rm -rf vsynth1 vsynth2 data
        rm -f asynth1.sw *~ audiogen videogen rotozoom tiny_psnr

diff --git a/vhook/Makefile b/vhook/Makefile
index 1ee2c5e..58844f9 100644 (file)
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -40,7 +40,10 @@ drawtext$(SLIBSUF): drawtext.o
        $(CC) $(LDFLAGS) -g -o $@ $(SHFLAGS) $<
 
 clean:
-       rm -f *.o *.d *~ .depend *.a *.lib *.so *.dylib *.dll
+       rm -f *.o *.d *~ *.a *.lib *.so *.dylib *.dll
+
+distclean: clean
+       rm -f Makefile.bak .depend
 
 ifneq ($(wildcard .depend),)
 include .depend