From e8f7398ce95c1cb1b8ee1114a3df47530523d74d Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 12 Nov 2007 03:18:49 +0000 Subject: [PATCH] rename DLNOBJS to MINIDLNOBJS. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 +++--- Makefile.in | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c441f73ee6..e51b022fc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,8 @@ -Mon Nov 12 10:29:16 2007 Tanaka Akira +Mon Nov 12 12:17:59 2007 Tanaka Akira - * configure.in (DLNOBJS): defined. + * configure.in (MINIDLNOBJS): defined. - * Makefile.in (miniruby): use DLNOBJS and COMMONOBJS instead of + * Makefile.in (miniruby): use MINIDLNOBJS 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 diff --git a/Makefile.in b/Makefile.in index d48594b3d7..966167b6cc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,7 +51,7 @@ DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@ SOLIBS = @SOLIBS@ MAINLIBS = @MAINLIBS@ MINIOBJS = @MINIOBJS@ -DLNOBJS = @DLNOBJS@ +MINIDLNOBJS = @MINIDLNOBJS@ RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@ RUBY_SO_NAME=@RUBY_SO_NAME@ @@ -106,7 +106,7 @@ all: miniruby$(EXEEXT): @$(RM) $@ - $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(DLNOBJS) $(COMMONOBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@ + $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIDLNOBJS) $(COMMONOBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@ $(PROGRAM): @$(RM) $@