From 6e000d88543e214d1ba816b91e44090d8e63e361 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 6 Mar 2009 05:28:42 +0000 Subject: [PATCH] * Makefile.in, win32/Makefile.sub (INSNS): moved variable definition before rule. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22792 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ Makefile.in | 3 +++ common.mk | 3 --- win32/Makefile.sub | 3 +++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 067dc70573..e6f579d996 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 6 14:28:36 2009 Nobuyoshi Nakada + + * Makefile.in, win32/Makefile.sub (INSNS): moved variable + definition before rule. + Fri Mar 6 13:47:10 2009 Nobuyoshi Nakada * lib/rake/loaders/makefile.rb (Rake::MakefileLoader#load): deals with diff --git a/Makefile.in b/Makefile.in index eaa9f9749f..bdbe36d9bd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -272,5 +272,8 @@ 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): $(srcdir)/insns.def vm_opts.h $(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ diff --git a/common.mk b/common.mk index f64bc7f821..d69afd1987 100644 --- a/common.mk +++ b/common.mk @@ -634,9 +634,6 @@ newline.$(OBJEXT): {$(VPATH)}newline.c {$(VPATH)}defines.h \ INSNS2VMOPT = --srcdir="$(srcdir)" -INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ - vmtc.inc vm.inc - {$(VPATH)}minsns.inc: $(srcdir)/template/minsns.inc.tmpl {$(VPATH)}opt_sc.inc: $(srcdir)/template/opt_sc.inc.tmpl diff --git a/win32/Makefile.sub b/win32/Makefile.sub index a876ab2d72..add643fa97 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -811,6 +811,9 @@ dir.$(OBJEXT) win32.$(OBJEXT): {$(srcdir)}win32/dir.h ext/extinit.obj: ext/extinit.c $(SETUP) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c +INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ + vmtc.inc vm.inc + !ifdef insns make_insns_rules: @type <<