diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | common.mk | 15 |
3 files changed, 16 insertions, 9 deletions
@@ -1,3 +1,9 @@ +Sat Nov 10 19:21:24 2007 Tanaka Akira <akr@fsij.org> + + * common.mk (EXPLOBJS): create new variable for ext_prelude.o. + + * Makefile.in(h: use EXPLOBJS. + Sat Nov 10 18:10:07 2007 Tanaka Akira <akr@fsij.org> * gem_prelude.rb: new file for gem libraries. currently empty. diff --git a/Makefile.in b/Makefile.in index 99f4a3929d..fae4bcdb1e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -116,12 +116,12 @@ $(PROGRAM): # supported. $(LIBRUBY_A): @$(RM) $@ - $(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT) + $(AR) $(ARFLAGS) $@ $(OBJS) $(EXPLOBJS) $(DMYEXT) @-$(RANLIB) $@ 2> /dev/null || true $(LIBRUBY_SO): @-$(PRE_LIBRUBY_UPDATE) - $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ + $(LDSHARED) $(DLDFLAGS) $(OBJS) $(EXPLOBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \ File.symlink "$(LIBRUBY_SO)", link}' \ $(LIBRUBY_ALIASES) || true @@ -15,7 +15,8 @@ RDOCOUT = $(EXTOUT)/rdoc DMYEXT = dmyext.$(OBJEXT) MAINOBJ = main.$(OBJEXT) -EXTOBJS = ext_prelude.$(OBJEXT) +EXTOBJS = +EXPLOBJS = ext_prelude.$(OBJEXT) DLDOBJS = $(DMYEXT) ENCOBJS = ascii.$(OBJEXT) \ @@ -103,11 +104,11 @@ prog: $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) $(MINIOBJS) $(OBJS) $(DMYEXT) -$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP) +$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXPLOBJS) $(EXTOBJS) $(SETUP) $(PREP) -$(LIBRUBY_A): $(OBJS) $(DMYEXT) $(ARCHFILE) +$(LIBRUBY_A): $(OBJS) $(EXPLOBJS) $(DMYEXT) $(ARCHFILE) -$(LIBRUBY_SO): $(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) +$(LIBRUBY_SO): $(OBJS) $(EXPLOBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) $(LIBRUBY_EXTS): @exit > $@ @@ -116,8 +117,8 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) @$(RM) $@ $(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS) -ruby.imp: $(OBJS) - @$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@ +ruby.imp: $(OBJS) $(EXPLOBJS) + @$(NM) -Pgp $(OBJS) $(EXPLOBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@ install: install-nodoc $(RDOCTARGET) install-all: install-nodoc install-doc @@ -295,7 +296,7 @@ clear-installed-list: clean: clean-ext clean-local clean-local:: - @$(RM) $(OBJS) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) + @$(RM) $(OBJS) $(EXPLOBJS) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) @$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time @$(RM) *.inc clean-ext: |