kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* Makefile.in, common.mk: add ext_prelude.o to OBJS.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13895 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2007-11-12 07:49:36 +00:00
parent a48fd5df21
commit c840239cc8
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Mon Nov 12 16:48:09 2007 Tanaka Akira <akr@fsij.org>
* Makefile.in, common.mk: add ext_prelude.o to OBJS.
Mon Nov 12 13:57:39 2007 Tanaka Akira <akr@fsij.org> Mon Nov 12 13:57:39 2007 Tanaka Akira <akr@fsij.org>
* configure.in (MINIDLNOBJS): removed. * configure.in (MINIDLNOBJS): removed.

10
Makefile.in
View file

@ -116,12 +116,12 @@ $(PROGRAM):
# supported. # supported.
$(LIBRUBY_A): $(LIBRUBY_A):
@$(RM) $@ @$(RM) $@
$(AR) $(ARFLAGS) $@ $(OBJS) ext_prelude.$(OBJEXT) $(DMYEXT) $(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT)
@-$(RANLIB) $@ 2> /dev/null || true @-$(RANLIB) $@ 2> /dev/null || true
$(LIBRUBY_SO): $(LIBRUBY_SO):
@-$(PRE_LIBRUBY_UPDATE) @-$(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; \ @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
File.symlink "$(LIBRUBY_SO)", link}' \ File.symlink "$(LIBRUBY_SO)", link}' \
$(LIBRUBY_ALIASES) || true $(LIBRUBY_ALIASES) || true
@ -168,11 +168,11 @@ $(srcdir)/configure: $(srcdir)/configure.in
# * svn checkout generate a file with mtime as current time # * svn checkout generate a file with mtime as current time
# * XFS has a mtime with fractional part # * XFS has a mtime with fractional part
lex.c: keywords 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 \ if test -f $@; then \
( touch $@ && echo $@ touched. ) \ touch $@ && echo $@ touched.; \
else \ else \
( cp $(srcdir)/lex.c $@ && echo $@ copied. ) \ cp $(srcdir)/lex.c $@ && echo $@ copied.; \
fi fi
.y.c: .y.c:

21
common.mk
View file

@ -24,9 +24,6 @@ ENCOBJS = ascii.$(OBJEXT) \
unicode.$(OBJEXT) \ unicode.$(OBJEXT) \
utf8.$(OBJEXT) utf8.$(OBJEXT)
OBJS = dln.$(OBJEXT) \
$(COMMONOBJS)
COMMONOBJS = array.$(OBJEXT) \ COMMONOBJS = array.$(OBJEXT) \
bignum.$(OBJEXT) \ bignum.$(OBJEXT) \
class.$(OBJEXT) \ class.$(OBJEXT) \
@ -83,6 +80,10 @@ COMMONOBJS = array.$(OBJEXT) \
$(ENCOBJS) \ $(ENCOBJS) \
$(MISSING) $(MISSING)
OBJS = dln.$(OBJEXT) \
ext_prelude.$(OBJEXT) \
$(COMMONOBJS)
SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \ SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \
--extout="$(EXTOUT)" \ --extout="$(EXTOUT)" \
--make="$(MAKE)" \ --make="$(MAKE)" \
@ -103,13 +104,13 @@ all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
@$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) @$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
prog: $(PROGRAM) $(WPROGRAM) 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): $(LIBRUBY_EXTS):
@exit > $@ @exit > $@
@ -118,8 +119,8 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
@$(RM) $@ @$(RM) $@
$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS) $(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
ruby.imp: $(OBJS) prelude.$(OBJEXT) ruby.imp: $(OBJS)
@$(NM) -Pgp $(OBJS) prelude.$(OBJEXT) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@ @$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
install: install-nodoc $(RDOCTARGET) install: install-nodoc $(RDOCTARGET)
install-all: install-nodoc install-doc install-all: install-nodoc install-doc
@ -297,7 +298,7 @@ clear-installed-list:
clean: clean-ext clean-local clean: clean-ext clean-local
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) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
@$(RM) *.inc @$(RM) *.inc
clean-ext: clean-ext: