diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | common.mk | 11 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 |
4 files changed, 14 insertions, 11 deletions
@@ -1,4 +1,4 @@ -Sun Jan 25 11:07:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jan 25 11:25:10 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * Makefile.in, win32/Makefile.sub (RMDIRS): remove directory and parents. @@ -6,14 +6,13 @@ Sun Jan 25 11:07:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * Makefile.in, win32/Makefile.sub (distclean-rdoc): added to remove temprary rdoc. - * Makefile.in, win32/Makefile.sub (distclean): removes extout - directory. - * Makefile.in, win32/Makefile.sub (clean-ext): skips non-existent directories. * common.mk (clean, distclean): cleans rdoc. + * common.mk (clean-extout): removes extout directory. + * configure.in (RMDIRS, RMALL): added to clean extout. * lib/fileutils.rb (FileUtils#rmdir): added :parents option. diff --git a/Makefile.in b/Makefile.in index 7873f69ba6..674fdeff44 100644 --- a/Makefile.in +++ b/Makefile.in @@ -229,10 +229,6 @@ distclean-local:: distclean-rdoc: @$(RMALL) $(RDOCOUT:/=\) -distclean: - @-rmdir $(EXTOUT)/$(arch) - @-rmdir $(EXTOUT) - clean-ext distclean-ext realclean-ext:: @set dummy ${EXTS}; shift; \ if test "$$#" = 0; then \ @@ -340,7 +340,7 @@ install-prereq: $(CLEAR_INSTALLED_LIST) clear-installed-list: @exit > $(INSTALLED_LIST) -clean: clean-ext clean-local clean-enc clean-golf clean-rdoc +clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-extout clean-local:: @$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) @$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time @@ -351,8 +351,10 @@ clean-enc: clean-golf: @$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS) clean-rdoc: +clean-extout: + @-$(RMDIRS) $(EXTOUT)/$(arch) -distclean: distclean-ext distclean-local distclean-enc distclean-golf +distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout distclean-local:: clean-local @$(RM) $(MKFILES) rbconfig.rb yasmdata.rb encdb.h @$(RM) config.cache config.log config.status config.status.lineno $(PRELUDES) @@ -363,13 +365,16 @@ distclean-enc: clean-enc distclean-golf: clean-golf @$(RM) $(GOLFPRELUDES) distclean-rdoc: +distclean-extout: clean-extout + @-$(RMDIRS) $(EXTOUT) -realclean:: realclean-ext realclean-local realclean-enc realclean-golf +realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout realclean-local:: distclean-local @$(RM) parse.c parse.h lex.c newline.c revision.h realclean-ext:: realclean-enc:: distclean-enc realclean-golf: distclean-golf +realclean-extout: distclean-extout check: test test-all diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 4092b3c737..28542a1870 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -712,6 +712,9 @@ clean-local:: @$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res @$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF) ext\ripper\y.output +clean: + @-rmdir $(EXTOUT:/=\)\$(arch) + distclean-local:: @$(RM) ext\config.cache $(RBCONFIG:/=\) $(CONFIG_H:/=\) @$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc |