From b0c77fe85bd58cf33da252960b0365e2600c0f04 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 3 Apr 2008 03:56:07 +0000
Subject: [PATCH] * Makefile.in, common.mk, configure.in,
 {win32,bcc32}/Makefile.sub   (MINIOBJS, ARCHMINIOBJS): separated.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15890 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog          | 5 +++++
 Makefile.in        | 2 +-
 bcc32/Makefile.sub | 2 +-
 common.mk          | 7 +++++--
 configure.in       | 2 +-
 win32/Makefile.sub | 2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b1e0966042..01a397f79e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr  3 12:56:01 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in, common.mk, configure.in, {win32,bcc32}/Makefile.sub
+	  (MINIOBJS, ARCHMINIOBJS): separated.
+
 Thu Apr  3 09:00:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* compile.c (iseq_set_sequence, iseq_insns_unification,
diff --git a/Makefile.in b/Makefile.in
index 09275ce4c8..9fc2803f5a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -51,7 +51,7 @@ LDSHARED = @LIBRUBY_LDSHARED@
 DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
 SOLIBS = @SOLIBS@
 MAINLIBS = @MAINLIBS@
-MINIOBJS = @MINIOBJS@ miniprelude.$(OBJEXT)
+ARCHMINIOBJS = @MINIOBJS@
 BUILTIN_ENCOBJS = @BUILTIN_ENCOBJS@
 
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 9c357cc1ce..fe848452e8 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -201,7 +201,7 @@ ASMEXT        = asm
 INSTALLED_LIST= .installed.list
 
 WINMAINOBJ    = winmain.$(OBJEXT)
-MINIOBJS      = dmydln.$(OBJEXT) dmyencoding.$(OBJEXT) dmytranscode.$(OBJEXT) miniprelude.$(OBJEXT)
+ARCHMINIOBJS  = dmydln.$(OBJEXT)
 
 arch_hdrdir = $(EXTOUT)/include/$(arch)
 hdrdir = $(srcdir)/include
diff --git a/common.mk b/common.mk
index 6d0e1caa76..fdffa04a60 100644
--- a/common.mk
+++ b/common.mk
@@ -18,6 +18,7 @@ NORMALMAINOBJ = main.$(OBJEXT)
 MAINOBJ       = $(NORMALMAINOBJ)
 EXTOBJS	      = 
 DLDOBJS	      = $(DMYEXT)
+MINIOBJS      = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) dmytranscode.$(OBJEXT) miniprelude.$(OBJEXT)
 
 COMMONOBJS    = array.$(OBJEXT) \
 		bignum.$(OBJEXT) \
@@ -106,7 +107,7 @@ BOOTSTRAPRUBY = $(BASERUBY)
 
 VCS           = svn
 
-all: $(MKFILES) $(PREP) encdb transdb $(RBCONFIG) $(LIBRUBY) encs
+all: $(MKFILES) $(PREP) incs $(RBCONFIG) $(LIBRUBY) encs
 	@$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS)
 prog: $(PROGRAM) $(WPROGRAM)
 
@@ -314,7 +315,7 @@ clean: clean-ext clean-local clean-enc
 clean-local::
 	@$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
 	@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
-	@$(RM) *.inc $(GOLFOBJS) y.tab.c y.output
+	@$(RM) *.inc $(GOLFOBJS) y.tab.c y.output encdb.h transdb.h
 clean-ext:
 	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) clean
 clean-enc:
@@ -718,6 +719,8 @@ srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c $(srcdir)/ext/ripper/ripper.c
 
 incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h $(srcdir)/revision.h
 
+insns: $(INSNS)
+
 node_name.inc: {$(VPATH)}node.h
 	$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@
 
diff --git a/configure.in b/configure.in
index 4f44ea02ff..cc83ae674a 100644
--- a/configure.in
+++ b/configure.in
@@ -1719,7 +1719,7 @@ case "$target_os" in
     *)
 	;;
 esac
-MINIOBJS="$MINIDLNOBJ dmyencoding.o dmytranscode.o"
+MINIOBJS="$MINIDLNOBJ"
 
 case "$build_os" in
   *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 7fd552fc0c..0112921800 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -250,7 +250,7 @@ INSTALLED_LIST= .installed.list
 !if !defined(WINMAINOBJ)
 WINMAINOBJ    = winmain.$(OBJEXT)
 !endif
-MINIOBJS      = dmydln.$(OBJEXT) dmyencoding.$(OBJEXT) dmytranscode.$(OBJEXT) miniprelude.$(OBJEXT)
+ARCHMINIOBJS  = dmydln.$(OBJEXT)
 LIBOBJS       = $(MISSING) $(LIBOBJS)
 
 !ifndef COMMON_LIBS