diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-16 04:07:23 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-16 04:07:23 +0000 |
commit | 575e4dfcbb133ed122bfac1f678dc6510e5769e2 (patch) | |
tree | bcffe0d89a0903905b06ca1ccedeeb09c6210b96 /win32 | |
parent | ba7c2f1e145081bdfb20c8abc3b231a6ad0ce1ac (diff) |
merges r21591 from trunk into ruby_1_9_1.
* win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc,
miniprelude.c, newline.c): if dependencies is newer than targets or
targets don't exist, try to create targets with BASERUBY. no need to
detect errors there because the absence of BASERUBY is not abnormal.
after the try, if the targets still don't exist, copy them from
$(srcdir).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r-- | win32/Makefile.sub | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index f76e2a7e45..d7691cd8b9 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -767,37 +767,22 @@ ext/extinit.obj: ext/extinit.c $(SETUP) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c $(INSNS): - @if exist $(srcdir:/=\)\$(@F) ( \ - if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ - ) else ( \ - @$(RM) $(PROGRAM) & \ - $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ \ - ) + @$(RM) $(PROGRAM) + -$(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ + if not exist $@ copy $(srcdir:/=\)\$(@F) $@ node_name.inc: - @if exist $(srcdir:/=\)\$(@F) ( \ - if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ - ) else ( \ - $(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ \ - ) + -$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ + if not exist $@ copy $(srcdir:/=\)\$(@F) $@ known_errors.inc: - @if exist $(srcdir:/=\)\$(@F) ( \ - if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ - ) else ( \ - $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def \ - ) + -$(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def + if not exist $@ copy $(srcdir:/=\)\$(@F) $@ miniprelude.c: - @if exist $(srcdir:/=\)\$(@F) ( \ - if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ - ) else ( \ - $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ \ - ) + -$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ + if not exist $@ copy $(srcdir:/=\)\$(@F) $@ newline.c: - @if exist $(srcdir:/=\)\$(@F) ( \ - if not "$(srcdir:/=\)" == "." if not "$(srcdir:/=\)" == "%CD%" copy $(srcdir:/=\)\$(@F) $@ \ - ) else ( \ - $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans \ - ) + -$(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans + if not exist $@ copy $(srcdir:/=\)\$(@F) $@ |