diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-25 02:06:29 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-25 02:06:29 +0000 |
| commit | 97de7d1081e69ad9d63c03b0f6a700954f8e4402 (patch) | |
| tree | 7cab17680e1e1f5c6b9340fb0102ef661f4db6c6 /Makefile.in | |
| parent | 0506348ef501d5f2e3dc64666b6bb6785870583c (diff) | |
* Makefile.in, win32/Makefile.sub (RMDIRS): remove directory and
parents.
* 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.
* configure.in (RMDIRS, RMALL): added to clean extout.
* lib/fileutils.rb (FileUtils#rmdir): added :parents option.
* lib/mkmf.rb (create_makefile): cleans installed files at clean
instead of distclean.
* lib/mkmf.rb (create_makefile): added clean-so and clean-rb.
* lib/mkmf.rb (def init_mkmf): added DISTCLEANDIRS.
* lib/un.rb (rmdir): added -p option.
* tool/rmdirs, win32/rmdirs.bat: removes directory and the parents.
* win32/rm.bat: added -r option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 4f5101ed34..7873f69ba6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -4,6 +4,7 @@ NULLCMD = : #### Start of system configuration section. #### srcdir = @srcdir@ +top_srcdir = $(srcdir) hdrdir = $(srcdir)/include CC = @CC@ @@ -94,6 +95,7 @@ MAKEDIRS = @MAKEDIRS@ CP = cp MV = mv RM = rm -f +RMDIRS = @RMDIRS@ NM = @NM@ AR = @AR@ ARFLAGS = rcu @@ -221,8 +223,15 @@ distclean-local:: @$(RM) ext/config.cache $(RBCONFIG) $(RM) Doxyfile @-$(RM) run.gdb - -$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h - -rmdir -p $(arch_hdrdir)/ruby + @-$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h + @-$(RMDIRS) $(arch_hdrdir)/ruby + +distclean-rdoc: + @$(RMALL) $(RDOCOUT:/=\) + +distclean: + @-rmdir $(EXTOUT)/$(arch) + @-rmdir $(EXTOUT) clean-ext distclean-ext realclean-ext:: @set dummy ${EXTS}; shift; \ @@ -230,13 +239,13 @@ clean-ext distclean-ext realclean-ext:: set dummy `find ext -name Makefile | sed 's:^ext/::;s:/Makefile$$::' | sort`; \ shift; \ fi; \ - cd ext; \ for dir; do \ + [ -f "ext/$$dir/Makefile" ] || continue; \ echo $(@:-ext=)ing "$$dir"; \ - (cd "$$dir"; $(MAKE) $(MFLAGS) $(@:-ext=)) && \ + (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \ case "$@" in \ *distclean-ext*|*realclean-ext*) \ - rmdir -p "$$dir" 2> /dev/null;; \ + $(RMDIRS) "ext/$$dir";; \ esac; \ done |