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

* configure.in, common.mk, Makefile.in: don't generate

Browse source 
libminiruby-static.a.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13871 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2007-11-10 14:18:03 +00:00
parent 7cb1a184c8
commit c585a9eba1
4 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Nov 10 23:08:53 2007 Tanaka Akira <akr@fsij.org>
* configure.in, common.mk, Makefile.in: don't generate
libminiruby-static.a.
Sat Nov 10 19:46:54 2007 Tanaka Akira <akr@fsij.org> Sat Nov 10 19:46:54 2007 Tanaka Akira <akr@fsij.org>
* configure.in, common.mk, Makefile.in: generate libminiruby-static.a * configure.in, common.mk, Makefile.in: generate libminiruby-static.a

10
Makefile.in
View file

@ -50,7 +50,7 @@ LDSHARED = @LIBRUBY_LDSHARED@
DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@ DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
SOLIBS = @SOLIBS@ SOLIBS = @SOLIBS@
MAINLIBS = @MAINLIBS@ MAINLIBS = @MAINLIBS@
MINIOBJS = @MINIOBJS@ prelude.$(OBJEXT) MINIOBJS = @MINIOBJS@
RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@ RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
RUBY_SO_NAME=@RUBY_SO_NAME@ RUBY_SO_NAME=@RUBY_SO_NAME@
@ -66,7 +66,6 @@ MAJOR= @MAJOR@
MINOR= @MINOR@ MINOR= @MINOR@
TEENY= @TEENY@ TEENY= @TEENY@
LIBMINIRUBY_A = @LIBMINIRUBY_A@
LIBRUBY_A = @LIBRUBY_A@ LIBRUBY_A = @LIBRUBY_A@
LIBRUBY_SO = @LIBRUBY_SO@ LIBRUBY_SO = @LIBRUBY_SO@
LIBRUBY_ALIASES= @LIBRUBY_ALIASES@ LIBRUBY_ALIASES= @LIBRUBY_ALIASES@
@ -106,7 +105,7 @@ all:
miniruby$(EXEEXT): miniruby$(EXEEXT):
@$(RM) $@ @$(RM) $@
$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(LIBMINIRUBY_A) $(LIBS) $(OUTFLAG)$@ $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(OBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@
$(PROGRAM): $(PROGRAM):
@$(RM) $@ @$(RM) $@
@ -115,11 +114,6 @@ $(PROGRAM):
# We must `rm' the library each time this rule is invoked because "updating" a # 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 # MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
# supported. # supported.
$(LIBMINIRUBY_A):
@$(RM) $@
$(AR) $(ARFLAGS) $@ $(OBJS) prelude.$(OBJEXT) $(DMYEXT)
@-$(RANLIB) $@ 2> /dev/null || true
$(LIBRUBY_A): $(LIBRUBY_A):
@$(RM) $@ @$(RM) $@
$(AR) $(ARFLAGS) $@ $(OBJS) ext_prelude.$(OBJEXT) $(DMYEXT) $(AR) $(ARFLAGS) $@ $(OBJS) ext_prelude.$(OBJEXT) $(DMYEXT)

6
common.mk
View file

@ -101,12 +101,10 @@ 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 $(LIBMINIRUBY_A) $(MAINOBJ) $(MINIOBJS) $(OBJS) $(DMYEXT) miniruby$(EXEEXT): config.status $(OBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) $(MAINOBJ) $(MINIOBJS) $(OBJS) $(DMYEXT)
$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) ext_prelude.$(OBJEXT) $(EXTOBJS) $(SETUP) $(PREP) $(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) ext_prelude.$(OBJEXT) $(EXTOBJS) $(SETUP) $(PREP)
$(LIBMINIRUBY_A): $(OBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE)
$(LIBRUBY_A): $(OBJS) ext_prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) $(LIBRUBY_A): $(OBJS) ext_prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE)
$(LIBRUBY_SO): $(OBJS) ext_prelude.$(OBJEXT) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) $(LIBRUBY_SO): $(OBJS) ext_prelude.$(OBJEXT) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE)
@ -297,7 +295,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) $(LIBMINIRUBY_A) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES) @$(RM) $(OBJS) prelude.$(OBJEXT) ext_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:

3
configure.in
View file

@ -1287,7 +1287,6 @@ AC_SUBST(RUNRUBY)
AC_SUBST(EXTOUT, [${EXTOUT=.ext}]) AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
FIRSTMAKEFILE="" FIRSTMAKEFILE=""
LIBMINIRUBY_A='libmini$(RUBY_SO_NAME)-static.a'
LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a' LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
LIBRUBY='$(LIBRUBY_A)' LIBRUBY='$(LIBRUBY_A)'
LIBRUBYARG_STATIC='-l$(RUBY_SO_NAME)-static' LIBRUBYARG_STATIC='-l$(RUBY_SO_NAME)-static'
@ -1438,7 +1437,6 @@ case "$target_os" in
;; ;;
os2-emx) os2-emx)
CFLAGS="$CFLAGS -DOS2 -Zmts" CFLAGS="$CFLAGS -DOS2 -Zmts"
LIBMINIRUBY_A=`echo $LIBMINIRUBY_A | sed 's/^lib//'`
LIBRUBY_A=`echo $LIBRUBY_A | sed 's/^lib//'` LIBRUBY_A=`echo $LIBRUBY_A | sed 's/^lib//'`
LIBRUBY_SO=`echo $LIBRUBY_SO | 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//'` LIBRUBY_ALIASES=`for i in $LIBRUBY_ALIASES; do echo "$i"; done | sed 's/^lib//'`
@ -1526,7 +1524,6 @@ AC_SUBST(RUBY_INSTALL_NAME)
AC_SUBST(rubyw_install_name) AC_SUBST(rubyw_install_name)
AC_SUBST(RUBYW_INSTALL_NAME) AC_SUBST(RUBYW_INSTALL_NAME)
AC_SUBST(RUBY_SO_NAME) AC_SUBST(RUBY_SO_NAME)
AC_SUBST(LIBMINIRUBY_A)
AC_SUBST(LIBRUBY_A) AC_SUBST(LIBRUBY_A)
AC_SUBST(LIBRUBY_SO) AC_SUBST(LIBRUBY_SO)
AC_SUBST(LIBRUBY_ALIASES) AC_SUBST(LIBRUBY_ALIASES)