nobu	2008-04-03 12:56:07 +0900 (Thu, 03 Apr 2008)

  New Revision: 15890

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/bcc32/Makefile.sub
    trunk/common.mk
    trunk/configure.in
    trunk/win32/Makefile.sub

  Log:
    * Makefile.in, common.mk, configure.in, {win32,bcc32}/Makefile.sub
      (MINIOBJS, ARCHMINIOBJS): separated.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/Makefile.in?r1=15890&r2=15889&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15890&r2=15889&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/Makefile.sub?r1=15890&r2=15889&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bcc32/Makefile.sub?r1=15890&r2=15889&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=15890&r2=15889&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=15890&r2=15889&diff_format=u

Index: configure.in
===================================================================
--- configure.in	(revision 15889)
+++ configure.in	(revision 15890)
@@ -1719,7 +1719,7 @@
     *)
 	;;
 esac
-MINIOBJS="$MINIDLNOBJ dmyencoding.o dmytranscode.o"
+MINIOBJS="$MINIDLNOBJ"
 
 case "$build_os" in
   *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15889)
+++ ChangeLog	(revision 15890)
@@ -1,3 +1,8 @@
+Thu Apr  3 12:56:01 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* Makefile.in, common.mk, configure.in, {win32,bcc32}/Makefile.sub
+	  (MINIOBJS, ARCHMINIOBJS): separated.
+
 Thu Apr  3 09:00:45 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* compile.c (iseq_set_sequence, iseq_insns_unification,
Index: common.mk
===================================================================
--- common.mk	(revision 15889)
+++ common.mk	(revision 15890)
@@ -18,6 +18,7 @@
 MAINOBJ       = $(NORMALMAINOBJ)
 EXTOBJS	      = 
 DLDOBJS	      = $(DMYEXT)
+MINIOBJS      = $(ARCHMINIOBJS) dmyencoding.$(OBJEXT) dmytranscode.$(OBJEXT) miniprelude.$(OBJEXT)
 
 COMMONOBJS    = array.$(OBJEXT) \
 		bignum.$(OBJEXT) \
@@ -106,7 +107,7 @@
 
 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-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 @@
 
 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 $? > $@
 
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 15889)
+++ win32/Makefile.sub	(revision 15890)
@@ -250,7 +250,7 @@
 !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
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 15889)
+++ Makefile.in	(revision 15890)
@@ -51,7 +51,7 @@
 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@
Index: bcc32/Makefile.sub
===================================================================
--- bcc32/Makefile.sub	(revision 15889)
+++ bcc32/Makefile.sub	(revision 15890)
@@ -201,7 +201,7 @@
 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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/