diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-07 07:28:56 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-07 07:28:56 +0000 |
commit | 2ce5ff1ac1f24f53d713090a54e959d18b3c5f7b (patch) | |
tree | 214a154c3528d20a4e47ba478f67bba47c92c71e | |
parent | fa3283c7ba24ef0595bd05cd88551c617e83d711 (diff) |
* Makefile.in, common.mk, {bcc,win}32/Makefile.sub (clean-ext): do not
use miniruby.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18411 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Makefile.in | 9 | ||||
-rw-r--r-- | bcc32/Makefile.sub | 8 | ||||
-rw-r--r-- | common.mk | 11 | ||||
-rw-r--r-- | win32/Makefile.sub | 8 |
5 files changed, 33 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Thu Aug 7 16:28:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * Makefile.in, common.mk, {bcc,win}32/Makefile.sub (clean-ext): do not + use miniruby. + Thu Aug 7 14:17:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * enc/depend: removed needless explicit commands. diff --git a/Makefile.in b/Makefile.in index 29a648c9a6..cdbad6d588 100644 --- a/Makefile.in +++ b/Makefile.in @@ -203,6 +203,15 @@ clean-local:: distclean-local:: @$(RM) ext/config.cache $(RBCONFIG) + -$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h + -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/\(.*\)'`; \ + (cd "$$dir"; $(MAKE) $(MFLAGS) $(@:-ext=)); \ + done ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 6923e4d9e5..ae5236e6c5 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -552,6 +552,14 @@ distclean-local:: @$(RM) ext\config.cache $(RBCONFIG:/=\) @$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc +clean-ext distclean-ext realclean-ext:: + @for /R ext %I in (.) do @if exist %I\Makefile ( \ + echo $(@:-ext=)ing %~nI & \ + cd %I & \ + $(MAKE) $(MFLAGS) $(@:-ext=) & \ + cd %CD% \ + ) + ext/extinit.obj: ext/extinit.c $(SETUP) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c @@ -329,8 +329,7 @@ clean-local:: @$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) @$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time @$(RM) *.inc $(GOLFOBJS) y.tab.c y.output encdb.h transdb.h -clean-ext: $(PREP) - @-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) clean +clean-ext:: clean-enc: @-$(MAKE) -f enc.mk $(MFLAGS) clean @@ -339,18 +338,14 @@ distclean-local:: clean-local @$(RM) $(MKFILES) $(arch_hdrdir)/ruby/config.h rbconfig.rb yasmdata.rb encdb.h @$(RM) config.cache config.log config.status config.status.lineno $(PRELUDES) @$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP) -distclean-ext: $(PREP) - @-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) distclean -# -$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h -# -rmdir -p $(arch_hdrdir)/ruby +distclean-ext:: distclean-enc: clean-enc @-$(MAKE) -f enc.mk $(MFLAGS) distclean realclean:: realclean-ext realclean-local realclean-enc realclean-local:: distclean-local @$(RM) parse.c lex.c revision.h -realclean-ext:: $(PREP) - @-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) realclean +realclean-ext:: realclean-enc:: distclean-enc check: test test-all diff --git a/win32/Makefile.sub b/win32/Makefile.sub index bb8f6daeb1..a12eb63870 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -710,6 +710,14 @@ distclean-local:: @$(RM) ext\config.cache $(RBCONFIG:/=\) $(CONFIG_H:/=\) @$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc +clean-ext distclean-ext realclean-ext:: + @for /R ext %I in (.) do @if exist %I\Makefile ( \ + echo $(@:-ext=)ing %~nI & \ + cd %I & \ + $(MAKE) $(MFLAGS) $(@:-ext=) & \ + cd %CD% \ + ) + $(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) \ |