mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
fa3283c7ba
commit
2ce5ff1ac1
5 changed files with 33 additions and 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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
11
common.mk
11
common.mk
|
@ -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
|
||||
|
|
|
@ -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) \
|
||||
|
|
Loading…
Reference in a new issue