# HG changeset patch
# User diego
# Date 1138320402 0
# Node ID ce1ba8fd57e7d48b9160cbb69cd331b2e74c74d5
# Parent  fa17424b4c7b9a2522b26c44fc4dc204cedfef36
Make clean/distclean behave uniformly in all directories.

diff -r fa17424b4c7b -r ce1ba8fd57e7 Makefile
--- a/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -521,11 +521,11 @@
 	@echo "Uninstall completed"
 
 clean:
-	-rm -f *.o *~ $(OBJS) codecs.conf.h
+	-rm -f *.o *.a *~ codecs.conf.h
 
-distclean: doxygen_clean
-	-rm -f *~ $(PRG) $(PRG_MENCODER) $(PRG_CFG) $(OBJS)
-	-rm -f *.o *.a .depend configure.log codecs.conf.h help_mp.h
+distclean: clean doxygen_clean
+	-rm -f *~ $(PRG) $(PRG_MENCODER) $(PRG_CFG)
+	-rm -f .depend configure.log codecs.conf.h help_mp.h
 	@for a in $(PARTS); do $(MAKE) -C $$a distclean; done
 
 strip:
diff -r fa17424b4c7b -r ce1ba8fd57e7 TOOLS/netstream/Makefile
--- a/TOOLS/netstream/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/TOOLS/netstream/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -52,8 +52,8 @@
 clean:
 	rm -f *.o *.a *~
 
-distclean:
-	rm -f test Makefile.bak *.o *.a *~ .depend
+distclean: clean
+	rm -f .depend test
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 drivers/Makefile
--- a/drivers/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/drivers/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -49,10 +49,8 @@
 dep:
 
 clean: 
-	rm -f *.o *~
-ifneq (,$(findstring 2.6, $(VERSION)))
+	rm -f *.o *.a *~
 	rm -f *.ko .mga* mga_vid.mod.c
-endif
 
 distclean: clean
 	rm -f mga_vid_test tdfx_vid_tst
diff -r fa17424b4c7b -r ce1ba8fd57e7 drivers/radeon/Makefile
--- a/drivers/radeon/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/drivers/radeon/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -30,7 +30,9 @@
 dep:
 
 clean: 
-	rm -f *.o *~
+	rm -f *.o *.a *~
+
+distclean: clean
 
 install:
 	mkdir -p $(MOD_PATH)
diff -r fa17424b4c7b -r ce1ba8fd57e7 input/Makefile
--- a/input/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/input/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -23,8 +23,8 @@
 clean:
 	rm -f *.o *.a *~
 
-distclean:
-	rm -f Makefile.bak *.o *.a *~ .depend
+distclean: clean
+	rm -f .depend
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 liba52/Makefile
--- a/liba52/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/liba52/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -30,8 +30,8 @@
 clean:
 	rm -f *.o *.a *~
 
-distclean:
-	rm -f test *.o *.a *~ .depend
+distclean: clean
+	rm -f .depend test
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 libaf/Makefile
--- a/libaf/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/libaf/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -60,8 +60,8 @@
 clean:
 	rm -f *.o *.a *~
 
-distclean:
-	rm -f *.o *.a *~ .depend
+distclean: clean
+	rm -f .depend
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 libao2/Makefile
--- a/libao2/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/libao2/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -37,8 +37,8 @@
 clean:
 	rm -f *.o *.a *~
 
-distclean:
-	rm -f Makefile.bak *.o *.a *~ .depend
+distclean: clean
+	rm -f .depend
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 libdha/Makefile
--- a/libdha/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/libdha/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -66,10 +66,10 @@
 	$(CC) test.c -o test $(SHORTNAME)
 
 clean:
-	rm -f *.o *.so *.so.* *~
+	rm -f *.o *.a *~ *.so *.so.*
 
-distclean:
-	rm -f Makefile.bak *.o *.so *.so.* test *~ .depend
+distclean: clean
+	rm -f .depend test
 	rm -f pci_dev_ids.c pci_ids.h pci_names.c pci_names.h pci_vendors.h pci.db
 
 dep:    depend
diff -r fa17424b4c7b -r ce1ba8fd57e7 libfaad2/Makefile
--- a/libfaad2/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/libfaad2/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -65,8 +65,8 @@
 clean:
 	rm -f *.o *.a *~
 
-distclean:
-	rm -f test *.o *.a *~ .depend
+distclean: clean
+	rm -f .depend test
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 libmenu/Makefile
--- a/libmenu/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/libmenu/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -27,8 +27,8 @@
 clean:
 	rm -f *.o *.a *~
 
-distclean:
-	rm -f Makefile.bak *.o *.a *~ .depend
+distclean: clean
+	rm -f .depend
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 libmpcodecs/Makefile
--- a/libmpcodecs/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/libmpcodecs/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -262,8 +262,8 @@
 	rm -f *.o *.a *~
 	rm -f native/*.o native/*.a native/*~
 
-distclean:
-	rm -f Makefile.bak $(OBJS) $(OBJS2) $(LIBNAME) $(LIBNAME2) *~ .depend
+distclean: clean
+	rm -f .depend
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 libmpdemux/Makefile
--- a/libmpdemux/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/libmpdemux/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -180,8 +180,8 @@
 clean:
 	rm -f *.o *.a *~ realrtsp/*.o realrtsp/*.a realrtsp/*~
 
-distclean:
-	rm -f test Makefile.bak *.o *.a *~ realrtsp/*.o realrtsp/*.a realrtsp/*~ .depend
+distclean: clean
+	rm -f .depend test
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 libmpdvdkit2/Makefile
--- a/libmpdvdkit2/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/libmpdvdkit2/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -61,9 +61,10 @@
 	$(CC) -o $(LIB).so -shared -rdynamic $(OBJS)
 
 clean:
-	rm -f $(OBJS) $(LIB).a $(LIB).so .depend
+	rm -f *.o *.a *~ *.so
 
 distclean: clean
+	rm -f .depend
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 libmpeg2/Makefile
--- a/libmpeg2/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/libmpeg2/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -45,8 +45,8 @@
 clean:
 	rm -f *.o *.a *~
 
-distclean:
-	rm -f Makefile.bak *.o *.a *~ .depend
+distclean: clean
+	rm -f .depend
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 libvo/Makefile
--- a/libvo/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/libvo/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -63,8 +63,8 @@
 clean:
 	rm -f *.o *.a *~
 
-distclean:
-	rm -f Makefile.bak *.o *.a *~ .depend
+distclean: clean
+	rm -f .depend
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 loader/Makefile
--- a/loader/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/loader/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -27,7 +27,7 @@
 all: libloader.a
 
 clean:
-	-rm -f *.o libloader.a
+	rm -f *.o *.a *~
 
 distclean: clean
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 loader/dmo/Makefile
--- a/loader/dmo/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/loader/dmo/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -28,8 +28,8 @@
 clean:
 	rm -f *.o *.a *~
 
-distclean:
-	rm -f Makefile.bak *.o *.a *~ .depend test test.raw
+distclean: clean
+	rm -f .depend test test.raw
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 loader/dshow/Makefile
--- a/loader/dshow/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/loader/dshow/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -30,8 +30,8 @@
 clean:
 	rm -f *.o *.a *~
 
-distclean:
-	rm -f Makefile.bak *.o *.a *~ .depend test test.raw
+distclean: clean
+	rm -f .depend test test.raw
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 mp3lib/Makefile
--- a/mp3lib/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/mp3lib/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -58,8 +58,8 @@
 clean:
 	rm -f *~ *.o *.a test1 test2
 
-distclean:
-	rm -f *~ *.o *.a Makefile.bak .depend
+distclean: clean
+	rm -f .depend
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 osdep/Makefile
--- a/osdep/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/osdep/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -47,8 +47,8 @@
 clean:
 	rm -f *.o *.a *~
 
-distclean:
-	rm -f Makefile.bak *.o *.a *~ .depend
+distclean: clean
+	rm -f .depend
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 postproc/Makefile
--- a/postproc/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/postproc/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -30,8 +30,8 @@
 clean:
 	rm -f *.o *.a *~ *.so cs_test swscale-example
 
-distclean:
-	rm -f Makefile.bak *.o *.a *~ *.so .depend cs_test swscale-example
+distclean: clean
+	rm -f .depend
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 tremor/Makefile
--- a/tremor/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/tremor/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -26,8 +26,8 @@
 clean:
 	rm -f *.o *.a *~
 
-distclean:
-	rm -f Makefile.bak *.o *.a *~ .depend
+distclean: clean
+	rm -f .depend
 
 dep:    depend
 
diff -r fa17424b4c7b -r ce1ba8fd57e7 vidix/Makefile
--- a/vidix/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/vidix/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -27,8 +27,8 @@
 	rm -f *.o *.a *~
 	$(DO_MAKE)
 
-distclean:
-	rm -f test *.o *.a *~ .depend
+distclean: clean
+	rm -f .depend test
 	$(DO_MAKE)
 
 dep:    depend
diff -r fa17424b4c7b -r ce1ba8fd57e7 vidix/drivers/Makefile
--- a/vidix/drivers/Makefile	Thu Jan 26 19:32:07 2006 +0000
+++ b/vidix/drivers/Makefile	Fri Jan 27 00:06:42 2006 +0000
@@ -152,8 +152,8 @@
 clean:
 	rm -f *.o *.so *~
 
-distclean:
-	rm -f Makefile.bak *.o *.so test *~ .depend
+distclean: clean
+	rm -f .depend test
 
 dep:    depend