* configure.in (MINIDLNOBJS): removed.
(MINIOBJS): set to dln.o if dmydln.o is not used. * Makefile.in (miniruby): use MINIOBJS instead of MINIDLNOBJS. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
8110d52333
commit
a48fd5df21
@ -1,3 +1,10 @@
|
|||||||
|
Mon Nov 12 13:57:39 2007 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
|
* configure.in (MINIDLNOBJS): removed.
|
||||||
|
(MINIOBJS): set to dln.o if dmydln.o is not used.
|
||||||
|
|
||||||
|
* Makefile.in (miniruby): use MINIOBJS instead of MINIDLNOBJS.
|
||||||
|
|
||||||
Mon Nov 12 13:53:06 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Mon Nov 12 13:53:06 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* misc/ruby-mode.el (ruby-parse-partial): handle stringified
|
* misc/ruby-mode.el (ruby-parse-partial): handle stringified
|
||||||
|
@ -51,7 +51,6 @@ DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
|
|||||||
SOLIBS = @SOLIBS@
|
SOLIBS = @SOLIBS@
|
||||||
MAINLIBS = @MAINLIBS@
|
MAINLIBS = @MAINLIBS@
|
||||||
MINIOBJS = @MINIOBJS@
|
MINIOBJS = @MINIOBJS@
|
||||||
MINIDLNOBJS = @MINIDLNOBJS@
|
|
||||||
|
|
||||||
RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
|
RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
|
||||||
RUBY_SO_NAME=@RUBY_SO_NAME@
|
RUBY_SO_NAME=@RUBY_SO_NAME@
|
||||||
@ -106,7 +105,7 @@ all:
|
|||||||
|
|
||||||
miniruby$(EXEEXT):
|
miniruby$(EXEEXT):
|
||||||
@$(RM) $@
|
@$(RM) $@
|
||||||
$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIDLNOBJS) $(COMMONOBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@
|
$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@
|
||||||
|
|
||||||
$(PROGRAM):
|
$(PROGRAM):
|
||||||
@$(RM) $@
|
@$(RM) $@
|
||||||
|
13
configure.in
13
configure.in
@ -1410,7 +1410,7 @@ AC_SUBST(RDOCTARGET)
|
|||||||
if test "$rb_with_pthread" = "yes"; then
|
if test "$rb_with_pthread" = "yes"; then
|
||||||
THREAD_MODEL=pthread
|
THREAD_MODEL=pthread
|
||||||
fi
|
fi
|
||||||
MINIDLNOBJS=dln.o
|
MINIDLNOBJ=dln.o
|
||||||
case "$target_os" in
|
case "$target_os" in
|
||||||
linux*)
|
linux*)
|
||||||
XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1"
|
XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1"
|
||||||
@ -1434,8 +1434,7 @@ case "$target_os" in
|
|||||||
;;
|
;;
|
||||||
darwin*)
|
darwin*)
|
||||||
CFLAGS="$CFLAGS -pipe -fno-common"
|
CFLAGS="$CFLAGS -pipe -fno-common"
|
||||||
MINIDLNOBJS=dmydln.o
|
MINIDLNOBJ=dmydln.o
|
||||||
MINIOBJS=dmydln.o
|
|
||||||
;;
|
;;
|
||||||
os2-emx)
|
os2-emx)
|
||||||
CFLAGS="$CFLAGS -DOS2 -Zmts"
|
CFLAGS="$CFLAGS -DOS2 -Zmts"
|
||||||
@ -1498,8 +1497,7 @@ case "$target_os" in
|
|||||||
LIBRUBY='lib$(RUBY_SO_NAME).a'
|
LIBRUBY='lib$(RUBY_SO_NAME).a'
|
||||||
LIBRUBYARG='-l$(RUBY_SO_NAME)'
|
LIBRUBYARG='-l$(RUBY_SO_NAME)'
|
||||||
fi
|
fi
|
||||||
MINIDLNOBJS=dmydln.o
|
MINIDLNOBJ=dmydln.o
|
||||||
MINIOBJS=dmydln.o
|
|
||||||
;;
|
;;
|
||||||
hpux*)
|
hpux*)
|
||||||
case "$YACC" in
|
case "$YACC" in
|
||||||
@ -1508,12 +1506,12 @@ case "$target_os" in
|
|||||||
YACC="$YACC -Nl40000 -Nm40000"
|
YACC="$YACC -Nl40000 -Nm40000"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
MINIDLNOBJS=dmydln.o
|
MINIDLNOBJ=dmydln.o
|
||||||
MINIOBJS=dmydln.o
|
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
MINIOBJS="$MINIDLNOBJ"
|
||||||
|
|
||||||
case "$build_os" in
|
case "$build_os" in
|
||||||
*msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
|
*msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
|
||||||
@ -1543,7 +1541,6 @@ AC_SUBST(COMMON_LIBS)
|
|||||||
AC_SUBST(COMMON_MACROS)
|
AC_SUBST(COMMON_MACROS)
|
||||||
AC_SUBST(COMMON_HEADERS)
|
AC_SUBST(COMMON_HEADERS)
|
||||||
AC_SUBST(EXPORT_PREFIX)
|
AC_SUBST(EXPORT_PREFIX)
|
||||||
AC_SUBST(MINIDLNOBJS)
|
|
||||||
AC_SUBST(MINIOBJS)
|
AC_SUBST(MINIOBJS)
|
||||||
AC_SUBST(THREAD_MODEL)
|
AC_SUBST(THREAD_MODEL)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user