diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-04 11:53:25 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-04 11:53:25 +0000 |
| commit | 549c6484d1dbe58aa39c830c1fe47702a2462ac3 (patch) | |
| tree | faf42ed8f6f9191be326171f0d58ab21efb03898 /win32 | |
| parent | d04b4a8a6ffd077dbcdaeda8c1785730d4679bde (diff) | |
merges r21284 from trunk into ruby_1_9_1.
* common.mk, Makefile.in, win32/Makefile.sub (INSNS): move the macro
definition from common.mk to {Makefile.in,win32/Makefile.sub}.
[ruby-dev:37678]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index d2efe4c16..e25a150e2 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -278,6 +278,9 @@ all: $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(srcdir)/common.mk ruby: $(PROGRAM) rubyw: $(WPROGRAM) +INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ + vmtc.inc vm.inc + !include $(srcdir)/common.mk $(MKFILES): $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub $(win_srcdir)/configure.bat $(win_srcdir)/setup.mak $(win_srcdir)/enc-setup.mak $(srcdir)/enc/Makefile.in @@ -759,8 +762,8 @@ ext/extinit.obj: ext/extinit.c $(SETUP) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c $(INSNS): - @if exist $(srcdir:/=\)\insns.inc ( \ - @for %I in ($(INSNS)) do @copy $(srcdir:/=\)\%~nxI %I \ + @if exist $(srcdir:/=\)\$(@F) ( \ + copy $(srcdir:/=\)\$(@F) $@ \ ) else ( \ @$(RM) $(PROGRAM) \ $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ \ |