[Ffmpeg-cvslog] CVS: ffmpeg Makefile,1.86,1.87

[Diego Biurrun CVS]

Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv15466

Modified Files:
	Makefile 
Log Message:
Make clean/distclean consistent throughout all the Makefiles.


Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/Makefile,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- Makefile	17 Dec 2005 18:14:25 -0000	1.86
+++ Makefile	16 Jan 2006 14:59:54 -0000	1.87
@@ -43,7 +43,6 @@
 ifeq ($(BUILD_VHOOK),yes)
 VHOOK=videohook
 INSTALLVHOOK=install-vhook
-CLEANVHOOK=clean-vhook
 endif
 
 ifeq ($(TARGET_OS), SunOS)
@@ -151,21 +150,23 @@
 	@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]