# HG changeset patch
# User diego
# Date 1209405254 0
# Node ID fe2f16a7b128775a06a1563dc8e39a6f8daef33f
# Parent  8a26190978a6043b3443574417bfa349a9bb3481
Merge now redundant clean and distclean rules into the top-level Makefile.

diff -r 8a26190978a6 -r fe2f16a7b128 Makefile
--- a/Makefile	Mon Apr 28 15:57:31 2008 +0000
+++ b/Makefile	Mon Apr 28 17:54:14 2008 +0000
@@ -640,7 +640,8 @@
         libpostproc \
         libswscale \
 
-DIRS =  dvdread \
+DIRS =  . \
+        dvdread \
         gui \
         gui/mplayer \
         gui/mplayer/gtk \
@@ -810,14 +811,14 @@
 	  fi ; \
 	done
 
-clean:: toolsclean
+clean: toolsclean
 	-rm -f mplayer$(EXESUF) mencoder$(EXESUF) codec-cfg$(EXESUF) \
 	  codecs2html$(EXESUF) codec-cfg-test$(EXESUF) cpuinfo$(EXESUF) \
 	  codecs.conf.h help_mp.h version.h TAGS tags $(VIDIX_PCI_FILES)
 	for part in $(PARTS); do $(MAKE) -C $$part clean; done
 	rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.ho /*~, $(addsuffix $(suffix),$(dir))))
 
-distclean:: doxygen_clean
+distclean: clean doxygen_clean
 	for part in $(PARTS); do $(MAKE) -C $$part distclean; done
 	-rm -f configure.log config.mak config.h
 	rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.d, $(addsuffix $(suffix),$(dir))))
diff -r 8a26190978a6 -r fe2f16a7b128 mpcommon.mak
--- a/mpcommon.mak	Mon Apr 28 15:57:31 2008 +0000
+++ b/mpcommon.mak	Mon Apr 28 17:54:14 2008 +0000
@@ -23,12 +23,6 @@
 	$(AR) r $@ $^
 	$(RANLIB) $@
 
-clean::
-	rm -f *.o *.a *.ho *~
-
-distclean:: clean
-	rm -f *.d test test2
-
 %.d: %.c
 	$(MPDEPEND_CMD) > $@