aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-29 10:40:34 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-29 10:40:34 +0000
commit1a65f34057398884e0f6d654965185ccadfeef03 (patch)
tree60620ecc29c1511ed8f92e11dfaadb4ee7a3f850
parent74b254e8335d3fe5570edc1284b63aa562d198d6 (diff)
downloadruby-1a65f34057398884e0f6d654965185ccadfeef03.tar.gz
* configure.in, common.mk: fix rule for dmytranscode.o.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--common.mk2
-rw-r--r--configure.in2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 74e6c3865d..9d36269661 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 29 19:39:40 2008 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * configure.in, common.mk: fix rule for dmytranscode.o.
+
Tue Jan 29 19:03:16 2008 NARUSE, Yui <naruse@ruby-lang.org>
* enc/trans/japanese.c (rb_to_Windows_31J): to 'Windows-31J'.
diff --git a/common.mk b/common.mk
index 83b9c2e829..56d842cbf1 100644
--- a/common.mk
+++ b/common.mk
@@ -59,7 +59,6 @@ COMMONOBJS = array.$(OBJEXT) \
string.$(OBJEXT) \
struct.$(OBJEXT) \
time.$(OBJEXT) \
- transcode.$(OBJEXT) \
util.$(OBJEXT) \
variable.$(OBJEXT) \
version.$(OBJEXT) \
@@ -78,6 +77,7 @@ COMMONOBJS = array.$(OBJEXT) \
OBJS = dln.$(OBJEXT) \
encoding.$(OBJEXT) \
prelude.$(OBJEXT) \
+ transcode.$(OBJEXT) \
$(COMMONOBJS)
GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
diff --git a/configure.in b/configure.in
index c064b378c0..52f948d3ef 100644
--- a/configure.in
+++ b/configure.in
@@ -1603,7 +1603,7 @@ case "$target_os" in
*)
;;
esac
-MINIOBJS="$MINIDLNOBJ dmyencoding.o"
+MINIOBJS="$MINIDLNOBJ dmyencoding.o dmytranscode.o"
case "$build_os" in
*msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;