[前][次][番号順一覧][スレッド一覧]

ruby-changes:2404

From: ko1@a...
Date: 12 Nov 2007 17:15:20 +0900
Subject: [ruby-changes:2404] akr - Ruby:r13897 (trunk): * Makefile.in, common.mk: add prelude.o to MINIOBJS.

akr	2007-11-12 17:15:10 +0900 (Mon, 12 Nov 2007)

  New Revision: 13897

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk

  Log:
    * Makefile.in, common.mk: add prelude.o to MINIOBJS.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/Makefile.in?r1=13897&r2=13896
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13897&r2=13896
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=13897&r2=13896

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13896)
+++ ChangeLog	(revision 13897)
@@ -1,3 +1,7 @@
+Mon Nov 12 17:13:23 2007  Tanaka Akira  <akr@f...>
+
+	* Makefile.in, common.mk: add prelude.o to MINIOBJS.
+
 Mon Nov 12 16:52:29 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (create_makefile): rdoc about srcprefix.  a patch from
Index: common.mk
===================================================================
--- common.mk	(revision 13896)
+++ common.mk	(revision 13897)
@@ -104,7 +104,7 @@
 	@$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
 prog: $(PROGRAM) $(WPROGRAM)
 
-miniruby$(EXEEXT): config.status $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE)
+miniruby$(EXEEXT): config.status $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE)
 
 $(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
 
@@ -298,7 +298,7 @@
 
 clean: clean-ext clean-local
 clean-local::
-	@$(RM) $(OBJS) $(MINIOBJS) prelude.$(OBJEXT) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
+	@$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
 	@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
 	@$(RM) *.inc
 clean-ext:
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 13896)
+++ Makefile.in	(revision 13897)
@@ -50,7 +50,7 @@
 DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
 SOLIBS = @SOLIBS@
 MAINLIBS = @MAINLIBS@
-MINIOBJS = @MINIOBJS@
+MINIOBJS = @MINIOBJS@ prelude.$(OBJEXT)
 
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
 RUBY_SO_NAME=@RUBY_SO_NAME@
@@ -105,7 +105,7 @@
 
 miniruby$(EXEEXT):
 		@$(RM) $@
-		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@
+		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@
 
 $(PROGRAM):
 		@$(RM) $@

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

[前][次][番号順一覧][スレッド一覧]