akr	2007-11-12 14:04:24 +0900 (Mon, 12 Nov 2007)

  New Revision: 13894

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/configure.in

  Log:
    * configure.in (MINIDLNOBJS): removed.
      (MINIOBJS): set to dln.o if dmydln.o is not used.
    
    * Makefile.in (miniruby): use MINIOBJS instead of MINIDLNOBJS.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/Makefile.in?r1=13894&r2=13893
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13894&r2=13893
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=13894&r2=13893

Index: configure.in
===================================================================
--- configure.in	(revision 13893)
+++ configure.in	(revision 13894)
@@ -1410,7 +1410,7 @@
 if test "$rb_with_pthread" = "yes"; then
     THREAD_MODEL=pthread
 fi
-MINIDLNOBJS=dln.o
+MINIDLNOBJ=dln.o
 case "$target_os" in
     linux*)
 	XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1"
@@ -1434,8 +1434,7 @@
 	;;
     darwin*)
     	CFLAGS="$CFLAGS -pipe -fno-common"
-        MINIDLNOBJS=dmydln.o
-	MINIOBJS=dmydln.o
+        MINIDLNOBJ=dmydln.o
 	;;
     os2-emx)
     	CFLAGS="$CFLAGS -DOS2 -Zmts"
@@ -1498,8 +1497,7 @@
 	    LIBRUBY='lib$(RUBY_SO_NAME).a'
 	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
 	fi
-        MINIDLNOBJS=dmydln.o
-	MINIOBJS=dmydln.o
+        MINIDLNOBJ=dmydln.o
 	;;
     hpux*)
 	case "$YACC" in
@@ -1508,12 +1506,12 @@
 	    YACC="$YACC -Nl40000 -Nm40000"
 	    ;;
 	esac
-        MINIDLNOBJS=dmydln.o
-	MINIOBJS=dmydln.o
+        MINIDLNOBJ=dmydln.o
 	;;
     *)
 	;;
 esac
+MINIOBJS="$MINIDLNOBJ"
 
 case "$build_os" in
   *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
@@ -1543,7 +1541,6 @@
 AC_SUBST(COMMON_MACROS)
 AC_SUBST(COMMON_HEADERS)
 AC_SUBST(EXPORT_PREFIX)
-AC_SUBST(MINIDLNOBJS)
 AC_SUBST(MINIOBJS)
 AC_SUBST(THREAD_MODEL)
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13893)
+++ ChangeLog	(revision 13894)
@@ -1,3 +1,10 @@
+Mon Nov 12 13:57:39 2007  Tanaka Akira  <akr@f...>
+
+	* 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@r...>
 
 	* misc/ruby-mode.el (ruby-parse-partial): handle stringified
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 13893)
+++ Makefile.in	(revision 13894)
@@ -51,7 +51,6 @@
 SOLIBS = @SOLIBS@
 MAINLIBS = @MAINLIBS@
 MINIOBJS = @MINIOBJS@
-MINIDLNOBJS = @MINIDLNOBJS@
 
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
 RUBY_SO_NAME=@RUBY_SO_NAME@
@@ -106,7 +105,7 @@
 
 miniruby$(EXEEXT):
 		@$(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):
 		@$(RM) $@

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml