r26583 - in trunk: Makefile mpcommon.mak
Author: diego Date: Mon Apr 28 19:54:14 2008 New Revision: 26583 Log: Merge now redundant clean and distclean rules into the top-level Makefile. Modified: trunk/Makefile trunk/mpcommon.mak Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Apr 28 19:54:14 2008 @@ -640,7 +640,8 @@ PARTS = libavcodec \ libpostproc \ libswscale \ -DIRS = dvdread \ +DIRS = . \ + dvdread \ gui \ gui/mplayer \ gui/mplayer/gtk \ @@ -810,14 +811,14 @@ uninstall: 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)))) Modified: trunk/mpcommon.mak ============================================================================== --- trunk/mpcommon.mak (original) +++ trunk/mpcommon.mak Mon Apr 28 19:54:14 2008 @@ -23,12 +23,6 @@ $(LIBNAME_COMMON) $(LIBNAME_MPLAYER) $(L $(AR) r $@ $^ $(RANLIB) $@ -clean:: - rm -f *.o *.a *.ho *~ - -distclean:: clean - rm -f *.d test test2 - %.d: %.c $(MPDEPEND_CMD) > $@
participants (1)
-
diego