2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index aa579796f0..9b5fec3e47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 30 10:33:05 2010  Nobuyoshi Nakada  <[email protected]>
+
+	* common.mk (COMMONOBJS): moved dln.o to OBJS not to conflict with
+	  dmydln.o.
+
 Tue Mar 30 02:40:31 2010  Akinori MUSHA  <[email protected]>
 
 	* prelude.rb (Process.daemon): New method.
diff --git a/common.mk b/common.mk
index 6476ef7319..3cf1b965c3 100644
--- a/common.mk
+++ b/common.mk
@@ -27,7 +27,6 @@ COMMONOBJS    = array.$(OBJEXT) \
 		class.$(OBJEXT) \
 		compar.$(OBJEXT) \
 		dir.$(OBJEXT) \
-		dln.$(OBJEXT) \
 		enum.$(OBJEXT) \
 		enumerator.$(OBJEXT) \
 		error.$(OBJEXT) \
@@ -61,7 +60,9 @@ COMMONOBJS    = array.$(OBJEXT) \
 		version.$(OBJEXT) \
 		$(MISSING)
 
-OBJS          = $(COMMONOBJS) prelude.$(OBJEXT)
+OBJS          = $(COMMONOBJS) \
+		dln.$(OBJEXT) \
+		prelude.$(OBJEXT)
 
 PRELUDE_SCRIPTS = $(srcdir)/prelude.rb
 PRELUDES      = prelude.c miniprelude.c