From 2840fa6b6504de820c3ca40457306787545d27fe Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 21 Jul 2007 08:48:29 +0000
Subject: * common.mk: inverted rules order.

* thread_win32.ci (w32_create_thread): bcc does not have
  _beginthreadex().

* bcc32/Makefile.sub: headers have moved.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12832 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 common.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'common.mk')

diff --git a/common.mk b/common.mk
index de84d52842..86dc9a0eb8 100644
--- a/common.mk
+++ b/common.mk
@@ -514,7 +514,7 @@ sjis.$(OBJEXT): {$(VPATH)}sjis.c {$(VPATH)}regenc.h \
 sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
   {$(VPATH)}re.h {$(VPATH)}regex.h {$(VPATH)}oniguruma.h \
-  {$(VPATH)}missing/vsnprintf.c
+  {$(VPATH)}vsnprintf.c
 st.$(OBJEXT): {$(VPATH)}st.c {$(VPATH)}config.h {$(VPATH)}st.h {$(VPATH)}defines.h
 string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
@@ -591,6 +591,10 @@ INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc \
 
 INSNS2VMOPT = --srcdir="$(srcdir)"
 
+$(INSNS): $(srcdir)/insns.def {$(VPATH)}vm_opts.h
+	$(RM) $(PROGRAM)
+	$(BASERUBY) -C $(srcdir) tool/insns2vm.rb $(INSNS2VMOPT)
+
 minsns.inc: $(srcdir)/template/minsns.inc.tmpl
 
 opt_sc.inc: $(srcdir)/template/opt_sc.inc.tmpl
@@ -607,10 +611,6 @@ vmtc.inc: $(srcdir)/template/vmtc.inc.tmpl
 
 vm.inc: $(srcdir)/template/vm.inc.tmpl
 
-$(INSNS): $(srcdir)/insns.def {$(VPATH)}vm_opts.h
-	$(RM) $(PROGRAM)
-	$(BASERUBY) $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT)
-
 incs: $(INSNS)
 
 docs:
-- 
cgit v1.2.3