akr	2007-11-12 10:31:11 +0900 (Mon, 12 Nov 2007)

  New Revision: 13888

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

  Log:
    * configure.in (DLNOBJS): defined.
    
    * Makefile.in (miniruby): use DLNOBJS and COMMONOBJS instead of
      MINIOBJS and OBJS to avoid linking both dmydln.o and dln.o.


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

Index: configure.in
===================================================================
--- configure.in	(revision 13887)
+++ configure.in	(revision 13888)
@@ -1410,6 +1410,7 @@
 if test "$rb_with_pthread" = "yes"; then
     THREAD_MODEL=pthread
 fi
+DLNOBJS=dln.o
 case "$target_os" in
     linux*)
 	XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1"
@@ -1433,6 +1434,7 @@
 	;;
     darwin*)
     	CFLAGS="$CFLAGS -pipe -fno-common"
+        DLNOBJS=dmydln.o
 	MINIOBJS=dmydln.o
 	;;
     os2-emx)
@@ -1496,6 +1498,7 @@
 	    LIBRUBY='lib$(RUBY_SO_NAME).a'
 	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
 	fi
+        DLNOBJS=dmydln.o
 	MINIOBJS=dmydln.o
 	;;
     hpux*)
@@ -1505,6 +1508,7 @@
 	    YACC="$YACC -Nl40000 -Nm40000"
 	    ;;
 	esac
+        DLNOBJS=dmydln.o
 	MINIOBJS=dmydln.o
 	;;
     *)
@@ -1539,6 +1543,7 @@
 AC_SUBST(COMMON_MACROS)
 AC_SUBST(COMMON_HEADERS)
 AC_SUBST(EXPORT_PREFIX)
+AC_SUBST(DLNOBJS)
 AC_SUBST(MINIOBJS)
 AC_SUBST(THREAD_MODEL)
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13887)
+++ ChangeLog	(revision 13888)
@@ -1,3 +1,10 @@
+Mon Nov 12 10:29:16 2007  Tanaka Akira  <akr@f...>
+
+	* configure.in (DLNOBJS): defined.
+
+	* Makefile.in (miniruby): use DLNOBJS and COMMONOBJS instead of
+	  MINIOBJS and OBJS to avoid linking both dmydln.o and dln.o.
+
 Sun Nov 11 20:32:45 2007  Tanaka Akira  <akr@f...>
 
 	* {win32,wince,bcc32}/Makefile.sub: delete lex.c rule.
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 13887)
+++ Makefile.in	(revision 13888)
@@ -51,6 +51,7 @@
 SOLIBS = @SOLIBS@
 MAINLIBS = @MAINLIBS@
 MINIOBJS = @MINIOBJS@
+DLNOBJS = @DLNOBJS@
 
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
 RUBY_SO_NAME=@RUBY_SO_NAME@
@@ -105,7 +106,7 @@
 
 miniruby$(EXEEXT):
 		@$(RM) $@
-		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(OBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@
+		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(DLNOBJS) $(COMMONOBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@
 
 $(PROGRAM):
 		@$(RM) $@

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