summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-30 01:33:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-30 01:33:13 +0000
commita0d6167d15bdac8fb1e9b68bb782c116d859646d (patch)
tree26992c79e188a83256a09cd15f79be6e90a949f9
parentd1a080689c0fd92e4068513e957082ae5c7cf7a3 (diff)
* common.mk (COMMONOBJS): moved dln.o to OBJS not to conflict with
dmydln.o. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@27102 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk5
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