diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-31 22:16:51 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-31 22:16:51 +0000 |
| commit | fd855a082bc0485dd2f9132a16cd91fd14ba76cb (patch) | |
| tree | 3fa7378e72db33c07a9270210c9cd9b92df8f1d6 | |
| parent | 79ccc677e779b360e21ba683a1c4f93939aa7c7d (diff) | |
* Makefile.in (distclean-ext, realclean-ext): use EXTS as default.
* win32/Makefile.sub (distclean-ext, realclean-ext): try to remove ext
directory.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 23 | ||||
| -rw-r--r-- | win32/Makefile.sub | 6 |
3 files changed, 27 insertions, 9 deletions
@@ -1,3 +1,10 @@ +Thu Jan 1 07:16:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * Makefile.in (distclean-ext, realclean-ext): use EXTS as default. + + * win32/Makefile.sub (distclean-ext, realclean-ext): try to remove ext + directory. + Thu Jan 1 06:56:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * tool/file2lastrev.rb: unset PWD. diff --git a/Makefile.in b/Makefile.in index 6f50565562..4c3651ff45 100644 --- a/Makefile.in +++ b/Makefile.in @@ -226,17 +226,24 @@ distclean-local:: -rmdir -p $(arch_hdrdir)/ruby clean-ext distclean-ext realclean-ext:: - @find ext -name Makefile | sort | while read mk; do \ - dir=`dirname "$$mk"`; \ - echo $(@:-ext=)ing `expr "$$dir" : 'ext/\(.*\)'`; \ + @set dummy ${EXTS}; shift; \ + if test "$$#" = 0; then \ + set dummy `find ext -name Makefile | sed 's:^ext/::;s:/Makefile$$::' | sort`; \ + shift; \ + fi; \ + cd ext; \ + for dir; do \ + echo $(@:-ext=)ing "$$dir"; \ (cd "$$dir"; $(MAKE) $(MFLAGS) $(@:-ext=)) && \ - if [ $@ == clean-ext ]; then \ - true; \ - else \ - rmdir -p "$$dir" 2> /dev/null; \ - fi; \ + case "$@" in \ + *distclean-ext*|*realclean-ext*) \ + rmdir -p "$$dir" 2> /dev/null;; \ + esac; \ done +distclean-ext realclean-ext:: + @-rmdir ext 2> /dev/null || true + ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c diff --git a/win32/Makefile.sub b/win32/Makefile.sub index a567c7799f..0586c1ba36 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -692,9 +692,13 @@ clean-ext distclean-ext realclean-ext:: echo $(@:-ext=)ing %~nI & \ cd %I & \ $(MAKE) $(MFLAGS) $(@:-ext=) & \ - cd %CD% \ + cd %CD% & \ + rmdir %I \ ) +distclean-ext realclean-ext:: + @-rmdir ext + $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb @$(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) \ |