ruby-changes:9743
From: usa <ko1@a...>
Date: Sat, 3 Jan 2009 22:26:34 +0900 (JST)
Subject: [ruby-changes:9743] Ruby:r21284 (trunk): * common.mk, Makefile.in, win32/Makefile.sub (INSNS): move the macro
usa 2009-01-03 22:26:11 +0900 (Sat, 03 Jan 2009) New Revision: 21284 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21284 Log: * common.mk, Makefile.in, win32/Makefile.sub (INSNS): move the macro definition from common.mk to {Makefile.in,win32/Makefile.sub}. [ruby-dev:37678] Modified files: trunk/ChangeLog trunk/Makefile.in trunk/common.mk trunk/win32/Makefile.sub Index: ChangeLog =================================================================== --- ChangeLog (revision 21283) +++ ChangeLog (revision 21284) @@ -1,3 +1,9 @@ +Sat Jan 3 22:24:36 2009 NAKAMURA Usaku <usa@r...> + + * 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 <naruse@r...> * enc/trans/chinese.trans: added for transcoding EUC-CN and GB12345. @@ -13,7 +19,7 @@ * 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 <mame@t...> Index: common.mk =================================================================== --- common.mk (revision 21283) +++ common.mk (revision 21284) @@ -615,9 +615,6 @@ {$(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 Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 21283) +++ win32/Makefile.sub (revision 21284) @@ -278,6 +278,9 @@ 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 @@ $(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) $@ \ Index: Makefile.in =================================================================== --- Makefile.in (revision 21283) +++ Makefile.in (revision 21284) @@ -270,6 +270,9 @@ @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) $@ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/