From 9282f9f9d41d1deda430246454a684aa7dd683cb Mon Sep 17 00:00:00 2001 From: usa Date: Sat, 3 Jan 2009 13:26:11 +0000 Subject: * 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@21284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 +++++++- Makefile.in | 3 +++ common.mk | 3 --- win32/Makefile.sub | 7 +++++-- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index df9832ba75..92e76bc8ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jan 3 22:24:36 2009 NAKAMURA Usaku + + * common.mk, Makefile.in, win32/Makefile.sub (INSNS): move the macro + definition from common.mk to {Makefile.in,win32/Makefile.sub}. + [ruby-dev:37678] + Sat Jan 3 15:30:09 2009 NARUSE, Yui * enc/trans/chinese.trans: added for transcoding EUC-CN and GB12345. @@ -13,7 +19,7 @@ Sat Jan 3 03:00:42 2009 NAKAMURA Usaku * common.mk, Makefile.in, win32/Makefile.sub ($(INSNS), node_name.inc, known_errors.inc, miniprelude.c, newline.c): move rules from common.mk - to {Makefile.in,win32/Makefile.sub) for nmake. + to {Makefile.in,win32/Makefile.sub} for nmake. [ruby-core:20993] Fri Jan 2 23:51:41 2009 Yusuke Endoh diff --git a/Makefile.in b/Makefile.in index d4ab5ad321..e86090ff56 100644 --- a/Makefile.in +++ b/Makefile.in @@ -270,6 +270,9 @@ test-rubyspec: @if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here. make update-rubyspec first.; exit 1; fi $(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec -B $(srcdir)/spec/default.mspec $(MSPECOPT) +INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ + vmtc.inc vm.inc + $(INSNS): @$(RM) $(PROGRAM) $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ diff --git a/common.mk b/common.mk index e10a9f1798..6550b1236c 100644 --- a/common.mk +++ b/common.mk @@ -615,9 +615,6 @@ newline.$(OBJEXT): {$(VPATH)}newline.c {$(VPATH)}defines.h \ {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \ {$(VPATH)}transcode_data.h {$(VPATH)}ruby.h {$(VPATH)}config.h -INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ - vmtc.inc vm.inc - INSNS2VMOPT = --srcdir="$(srcdir)" $(INSNS): $(srcdir)/insns.def {$(VPATH)}vm_opts.h $(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def diff --git a/win32/Makefile.sub b/win32/Makefile.sub index d2efe4c163..e25a150e20 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) $@ \ -- cgit v1.2.3