ruby-changes:2405
From: ko1@a...
Date: 12 Nov 2007 17:28:38 +0900
Subject: [ruby-changes:2405] akr - Ruby:r13895 (trunk): * Makefile.in, common.mk: add ext_prelude.o to OBJS.
akr 2007-11-12 16:49:36 +0900 (Mon, 12 Nov 2007) New Revision: 13895 Modified files: trunk/ChangeLog trunk/Makefile.in trunk/common.mk Log: * Makefile.in, common.mk: add ext_prelude.o to OBJS. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/Makefile.in?r1=13895&r2=13894 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13895&r2=13894 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=13895&r2=13894 Index: ChangeLog =================================================================== --- ChangeLog (revision 13894) +++ ChangeLog (revision 13895) @@ -1,3 +1,7 @@ +Mon Nov 12 16:48:09 2007 Tanaka Akira <akr@f...> + + * Makefile.in, common.mk: add ext_prelude.o to OBJS. + Mon Nov 12 13:57:39 2007 Tanaka Akira <akr@f...> * configure.in (MINIDLNOBJS): removed. Index: common.mk =================================================================== --- common.mk (revision 13894) +++ common.mk (revision 13895) @@ -24,9 +24,6 @@ unicode.$(OBJEXT) \ utf8.$(OBJEXT) -OBJS = dln.$(OBJEXT) \ - $(COMMONOBJS) - COMMONOBJS = array.$(OBJEXT) \ bignum.$(OBJEXT) \ class.$(OBJEXT) \ @@ -83,6 +80,10 @@ $(ENCOBJS) \ $(MISSING) +OBJS = dln.$(OBJEXT) \ + ext_prelude.$(OBJEXT) \ + $(COMMONOBJS) + SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \ --extout="$(EXTOUT)" \ --make="$(MAKE)" \ @@ -103,13 +104,13 @@ @$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) prog: $(PROGRAM) $(WPROGRAM) -miniruby$(EXEEXT): config.status $(MAINOBJ) $(MINIOBJS) $(OBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) +miniruby$(EXEEXT): config.status $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) -$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) ext_prelude.$(OBJEXT) $(EXTOBJS) $(SETUP) $(PREP) +$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP) -$(LIBRUBY_A): $(OBJS) ext_prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) +$(LIBRUBY_A): $(OBJS) $(DMYEXT) $(ARCHFILE) -$(LIBRUBY_SO): $(OBJS) ext_prelude.$(OBJEXT) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) +$(LIBRUBY_SO): $(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) $(LIBRUBY_EXTS): @exit > $@ @@ -118,8 +119,8 @@ @$(RM) $@ $(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS) -ruby.imp: $(OBJS) prelude.$(OBJEXT) - @$(NM) -Pgp $(OBJS) prelude.$(OBJEXT) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@ +ruby.imp: $(OBJS) + @$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@ install: install-nodoc $(RDOCTARGET) install-all: install-nodoc install-doc @@ -297,7 +298,7 @@ clean: clean-ext clean-local clean-local:: - @$(RM) $(OBJS) prelude.$(OBJEXT) ext_prelude.$(OBJEXT) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) + @$(RM) $(OBJS) $(MINIOBJS) prelude.$(OBJEXT) $(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 13894) +++ Makefile.in (revision 13895) @@ -116,12 +116,12 @@ # supported. $(LIBRUBY_A): @$(RM) $@ - $(AR) $(ARFLAGS) $@ $(OBJS) ext_prelude.$(OBJEXT) $(DMYEXT) + $(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT) @-$(RANLIB) $@ 2> /dev/null || true $(LIBRUBY_SO): @-$(PRE_LIBRUBY_UPDATE) - $(LDSHARED) $(DLDFLAGS) $(OBJS) ext_prelude.$(OBJEXT) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ + $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \ File.symlink "$(LIBRUBY_SO)", link}' \ $(LIBRUBY_ALIASES) || true @@ -168,11 +168,11 @@ # * svn checkout generate a file with mtime as current time # * XFS has a mtime with fractional part lex.c: keywords - ( gperf --output-file=$@.tmp -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? && mv $@.tmp $@ ) || \ + ( gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && mv $@.tmp $@ ) || \ if test -f $@; then \ - ( touch $@ && echo $@ touched. ) \ + touch $@ && echo $@ touched.; \ else \ - ( cp $(srcdir)/lex.c $@ && echo $@ copied. ) \ + cp $(srcdir)/lex.c $@ && echo $@ copied.; \ fi .y.c: -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml