From e7032041e59ededaa48a99f3bd16d2b9e1b99901 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 14 Jan 2008 16:19:02 +0000
Subject: * common.mk (OBJS): moved encoding.o from COMMONOBJS.

* common.mk (dmyencoding.o): added.  [ruby-dev:33099]

* configure.in, {win,bcc}32/Makefile.sub (MINIOBJS): added
  dmyencoding.o.

* dmyencoding.c (rb_locale_charmap): returns nil for miniruby.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 common.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'common.mk')

diff --git a/common.mk b/common.mk
index 9879c47b4..9392d684f 100644
--- a/common.mk
+++ b/common.mk
@@ -24,7 +24,6 @@ COMMONOBJS    = array.$(OBJEXT) \
 		class.$(OBJEXT) \
 		compar.$(OBJEXT) \
 		dir.$(OBJEXT) \
-		encoding.$(OBJEXT) \
 		enum.$(OBJEXT) \
 		enumerator.$(OBJEXT) \
 		error.$(OBJEXT) \
@@ -77,6 +76,7 @@ COMMONOBJS    = array.$(OBJEXT) \
 		$(MISSING)
 
 OBJS          = dln.$(OBJEXT) \
+		encoding.$(OBJEXT) \
 		prelude.$(OBJEXT) \
 		$(COMMONOBJS)
 
@@ -428,6 +428,10 @@ dmydln.$(OBJEXT): {$(VPATH)}dmydln.c {$(VPATH)}dln.c {$(VPATH)}ruby.h \
   {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
   {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}dln.h
 dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
+dmyencoding.$(OBJEXT): {$(VPATH)}dmyencoding.c {$(VPATH)}encoding.c {$(VPATH)}ruby.h \
+  {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
+  {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}encoding.h \
+  {$(VPATH)}oniguruma.h {$(VPATH)}regenc.h {$(VPATH)}encdb.h
 encoding.$(OBJEXT): {$(VPATH)}encoding.c {$(VPATH)}ruby.h \
   {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
   {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}encoding.h \
-- 
cgit