ruby-changes:2377
From: ko1@a...
Date: 10 Nov 2007 19:51:12 +0900
Subject: [ruby-changes:2377] akr - Ruby:r13868 (trunk): * common.mk, Makefile.in: generate libminiruby-static.a
akr 2007-11-10 19:50:58 +0900 (Sat, 10 Nov 2007)
New Revision: 13868
Modified files:
trunk/ChangeLog
trunk/Makefile.in
trunk/common.mk
trunk/configure.in
Log:
* common.mk, Makefile.in: generate libminiruby-static.a
which contains prelude.o for miniruby.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/Makefile.in?r1=13868&r2=13867
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13868&r2=13867
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=13868&r2=13867
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=13868&r2=13867
Index: configure.in
===================================================================
--- configure.in (revision 13867)
+++ configure.in (revision 13868)
@@ -1287,6 +1287,7 @@
AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
FIRSTMAKEFILE=""
+LIBMINIRUBY_A='libmini$(RUBY_SO_NAME)-static.a'
LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
LIBRUBY='$(LIBRUBY_A)'
LIBRUBYARG_STATIC='-l$(RUBY_SO_NAME)-static'
@@ -1437,6 +1438,7 @@
;;
os2-emx)
CFLAGS="$CFLAGS -DOS2 -Zmts"
+ LIBMINIRUBY_A=`echo $LIBMINIRUBY_A | sed 's/^lib//'`
LIBRUBY_A=`echo $LIBRUBY_A | sed 's/^lib//'`
LIBRUBY_SO=`echo $LIBRUBY_SO | sed 's/^lib//'`
LIBRUBY_ALIASES=`for i in $LIBRUBY_ALIASES; do echo "$i"; done | sed 's/^lib//'`
@@ -1524,6 +1526,7 @@
AC_SUBST(rubyw_install_name)
AC_SUBST(RUBYW_INSTALL_NAME)
AC_SUBST(RUBY_SO_NAME)
+AC_SUBST(LIBMINIRUBY_A)
AC_SUBST(LIBRUBY_A)
AC_SUBST(LIBRUBY_SO)
AC_SUBST(LIBRUBY_ALIASES)
Index: ChangeLog
===================================================================
--- ChangeLog (revision 13867)
+++ ChangeLog (revision 13868)
@@ -1,9 +1,8 @@
-Sat Nov 10 19:21:24 2007 Tanaka Akira <akr@f...>
+Sat Nov 10 19:46:54 2007 Tanaka Akira <akr@f...>
- * common.mk (EXPLOBJS): create new variable for ext_prelude.o.
+ * common.mk, Makefile.in: generate libminiruby-static.a
+ which contains prelude.o for miniruby.
- * Makefile.in(h: use EXPLOBJS.
-
Sat Nov 10 18:10:07 2007 Tanaka Akira <akr@f...>
* gem_prelude.rb: new file for gem libraries. currently empty.
Index: common.mk
===================================================================
--- common.mk (revision 13867)
+++ common.mk (revision 13868)
@@ -16,7 +16,6 @@
DMYEXT = dmyext.$(OBJEXT)
MAINOBJ = main.$(OBJEXT)
EXTOBJS =
-EXPLOBJS = ext_prelude.$(OBJEXT)
DLDOBJS = $(DMYEXT)
ENCOBJS = ascii.$(OBJEXT) \
@@ -102,14 +101,16 @@
@$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
prog: $(PROGRAM) $(WPROGRAM)
-miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) $(MINIOBJS) $(OBJS) $(DMYEXT)
+miniruby$(EXEEXT): config.status $(LIBMINIRUBY_A) $(MAINOBJ) $(MINIOBJS) $(OBJS) $(DMYEXT)
-$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXPLOBJS) $(EXTOBJS) $(SETUP) $(PREP)
+$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) ext_prelude.$(OBJEXT) $(EXTOBJS) $(SETUP) $(PREP)
-$(LIBRUBY_A): $(OBJS) $(EXPLOBJS) $(DMYEXT) $(ARCHFILE)
+$(LIBMINIRUBY_A): $(OBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE)
-$(LIBRUBY_SO): $(OBJS) $(EXPLOBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE)
+$(LIBRUBY_A): $(OBJS) ext_prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE)
+$(LIBRUBY_SO): $(OBJS) ext_prelude.$(OBJEXT) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE)
+
$(LIBRUBY_EXTS):
@exit > $@
@@ -117,8 +118,8 @@
@$(RM) $@
$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
-ruby.imp: $(OBJS) $(EXPLOBJS)
- @$(NM) -Pgp $(OBJS) $(EXPLOBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
+ruby.imp: $(OBJS) prelude.$(OBJEXT)
+ @$(NM) -Pgp $(OBJS) prelude.$(OBJEXT) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
install: install-nodoc $(RDOCTARGET)
install-all: install-nodoc install-doc
@@ -296,7 +297,7 @@
clean: clean-ext clean-local
clean-local::
- @$(RM) $(OBJS) $(EXPLOBJS) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
+ @$(RM) $(OBJS) prelude.$(OBJEXT) ext_prelude.$(OBJEXT) $(MAINOBJ) $(WINMAINOBJ) $(LIBMINIRUBY_A) $(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 13867)
+++ Makefile.in (revision 13868)
@@ -66,6 +66,7 @@
MINOR= @MINOR@
TEENY= @TEENY@
+LIBMINIRUBY_A = @LIBMINIRUBY_A@
LIBRUBY_A = @LIBRUBY_A@
LIBRUBY_SO = @LIBRUBY_SO@
LIBRUBY_ALIASES= @LIBRUBY_ALIASES@
@@ -105,7 +106,7 @@
miniruby$(EXEEXT):
@$(RM) $@
- $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@
+ $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(LIBMINIRUBY_A) $(LIBS) $(OUTFLAG)$@
$(PROGRAM):
@$(RM) $@
@@ -114,14 +115,19 @@
# We must `rm' the library each time this rule is invoked because "updating" a
# MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
# supported.
+$(LIBMINIRUBY_A):
+ @$(RM) $@
+ $(AR) $(ARFLAGS) $@ $(OBJS) prelude.$(OBJEXT) $(DMYEXT)
+ @-$(RANLIB) $@ 2> /dev/null || true
+
$(LIBRUBY_A):
@$(RM) $@
- $(AR) $(ARFLAGS) $@ $(OBJS) $(EXPLOBJS) $(DMYEXT)
+ $(AR) $(ARFLAGS) $@ $(OBJS) ext_prelude.$(OBJEXT) $(DMYEXT)
@-$(RANLIB) $@ 2> /dev/null || true
$(LIBRUBY_SO):
@-$(PRE_LIBRUBY_UPDATE)
- $(LDSHARED) $(DLDFLAGS) $(OBJS) $(EXPLOBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
+ $(LDSHARED) $(DLDFLAGS) $(OBJS) ext_prelude.$(OBJEXT) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
File.symlink "$(LIBRUBY_SO)", link}' \
$(LIBRUBY_ALIASES) || true
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml