ruby-changes:6893
From: nobu <ko1@a...>
Date: Thu, 7 Aug 2008 16:29:14 +0900 (JST)
Subject: [ruby-changes:6893] Ruby:r18411 (ruby_1_8, trunk): * Makefile.in, common.mk, {bcc,win}32/Makefile.sub (clean-ext): do not
nobu 2008-08-07 16:28:56 +0900 (Thu, 07 Aug 2008) New Revision: 18411 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18411 Log: * Makefile.in, common.mk, {bcc,win}32/Makefile.sub (clean-ext): do not use miniruby. Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/Makefile.in branches/ruby_1_8/bcc32/Makefile.sub branches/ruby_1_8/common.mk branches/ruby_1_8/win32/Makefile.sub trunk/ChangeLog trunk/Makefile.in trunk/bcc32/Makefile.sub trunk/common.mk trunk/win32/Makefile.sub Index: ChangeLog =================================================================== --- ChangeLog (revision 18410) +++ ChangeLog (revision 18411) @@ -1,3 +1,8 @@ +Thu Aug 7 16:28:51 2008 Nobuyoshi Nakada <nobu@r...> + + * 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@r...> * enc/depend: removed needless explicit commands. Index: common.mk =================================================================== --- common.mk (revision 18410) +++ common.mk (revision 18411) @@ -329,8 +329,7 @@ @$(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 @@ @$(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 Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 18410) +++ win32/Makefile.sub (revision 18411) @@ -710,6 +710,14 @@ @$(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) \ Index: Makefile.in =================================================================== --- Makefile.in (revision 18410) +++ Makefile.in (revision 18411) @@ -203,7 +203,16 @@ 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 Index: bcc32/Makefile.sub =================================================================== --- bcc32/Makefile.sub (revision 18410) +++ bcc32/Makefile.sub (revision 18411) @@ -552,6 +552,14 @@ @$(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 Index: ruby_1_8/Makefile.in =================================================================== --- ruby_1_8/Makefile.in (revision 18410) +++ ruby_1_8/Makefile.in (revision 18411) @@ -183,7 +183,15 @@ distclean-local:: @$(RM) ext/config.cache $(RBCONFIG) + -$(RM) $(INSTALLED_LIST) +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) $(OUTFLAG)$@ -c ext/extinit.c Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 18410) +++ ruby_1_8/ChangeLog (revision 18411) @@ -1,3 +1,8 @@ +Thu Aug 7 16:28:51 2008 Nobuyoshi Nakada <nobu@r...> + + * Makefile.in, common.mk, {bcc,win}32/Makefile.sub (clean-ext): do not + use miniruby. + Thu Aug 7 14:16:24 2008 Nobuyoshi Nakada <nobu@r...> * lib/mkmf.rb, {bcc32,win32}/Makefile.sub (CLEANLIBS, CLEANOBJS): Index: ruby_1_8/bcc32/Makefile.sub =================================================================== --- ruby_1_8/bcc32/Makefile.sub (revision 18410) +++ ruby_1_8/bcc32/Makefile.sub (revision 18411) @@ -486,6 +486,14 @@ @$(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% \ + ) + update-rubyspec: @echo SPEC_EXISTS=0 > $@.mk @if exist $(srcdir:/=\)\rubyspec\nul echo SPEC_EXISTS=1 >> $@.mk Index: ruby_1_8/common.mk =================================================================== --- ruby_1_8/common.mk (revision 18410) +++ ruby_1_8/common.mk (revision 18411) @@ -284,22 +284,19 @@ @$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) @$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time @$(RM) y.tab.c y.output -clean-ext: - @-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) clean +clean-ext:: distclean: distclean-ext distclean-local distclean-local:: clean-local @$(RM) $(MKFILES) config.h rbconfig.rb @$(RM) config.cache config.log config.status @$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP) -distclean-ext: - @-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) distclean +distclean-ext:: realclean:: realclean-ext realclean-local realclean-local:: distclean-local @$(RM) parse.c lex.c realclean-ext:: - @-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) realclean check: test test-all Index: ruby_1_8/win32/Makefile.sub =================================================================== --- ruby_1_8/win32/Makefile.sub (revision 18410) +++ ruby_1_8/win32/Makefile.sub (revision 18411) @@ -619,6 +619,14 @@ @$(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) @$(MINIRUBY) $(srcdir)/win32/resource.rb \ -ruby_name=$(RUBY_INSTALL_NAME) \ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/