Mercurial > mplayer.hg

changeset 26551:fe2f16a7b128

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge now redundant clean and distclean rules into the top-level Makefile.
author diego
date Mon, 28 Apr 2008 17:54:14 +0000
parents 8a26190978a6
children 806697d15e5c
files Makefile mpcommon.mak
diffstat 2 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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))))
--- 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) > $@