diff options
| author |  diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-28 17:54:14 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-28 17:54:14 +0000 |
| commit | 75e96820c46addeba6accc4501ff47c40977db3f (patch) | |
| tree | b995cc225dd18349698cfdbb06298b2f8177e6f5 | |
| parent | d90a7e02837fb466b76b847a74183bd4eac3fe9f (diff) | |
Merge now redundant clean and distclean rules into the top-level Makefile.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26583 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | mpcommon.mak | 6 |
2 files changed, 4 insertions, 9 deletions
@@ -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)))) diff --git a/mpcommon.mak b/mpcommon.mak index 1809074495..dea0f6b7d0 100644 --- a/mpcommon.mak +++ b/mpcommon.mak @@ -23,12 +23,6 @@ $(LIBNAME_COMMON) $(LIBNAME_MPLAYER) $(LIBNAME_MENCODER): $(AR) r $@ $^ $(RANLIB) $@ -clean:: - rm -f *.o *.a *.ho *~ - -distclean:: clean - rm -f *.d test test2 - %.d: %.c $(MPDEPEND_CMD) > $@ |