diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-12 08:15:10 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-12 08:15:10 +0000 |
commit | 2c42aa4364f2be6cfc83183ad51cc771a6cfb065 (patch) | |
tree | 521f529ae06c1b1daad2129722c4b1de449c4b51 | |
parent | bbad2d22eae6ce9a3fe9b7ad257ff1dadfdeb763 (diff) | |
download | ruby-2c42aa4364f2be6cfc83183ad51cc771a6cfb065.tar.gz |
* Makefile.in, common.mk: add prelude.o to MINIOBJS.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | common.mk | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Mon Nov 12 17:13:23 2007 Tanaka Akira <akr@fsij.org> + + * Makefile.in, common.mk: add prelude.o to MINIOBJS. + Mon Nov 12 16:52:29 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (create_makefile): rdoc about srcprefix. a patch from diff --git a/Makefile.in b/Makefile.in index 0f5a512b49..6a4720c940 100644 --- a/Makefile.in +++ b/Makefile.in @@ -50,7 +50,7 @@ LDSHARED = @LIBRUBY_LDSHARED@ 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 @@ all: 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) $@ @@ -104,7 +104,7 @@ all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY) @$(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 @@ clear-installed-list: 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: |