summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--common.mk9
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d13911641..7a1a9f6428 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 9 16:36:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (ruby.imp): excluded prelude.o to get rid of circular
+ dependency. [ruby-dev:39052]
+
Sun Aug 9 14:49:24 2009 Yusuke Endoh <mame@tsg.ne.jp>
* bignum.c (rb_big_cmp, bigsub, big_real_len, bigmul1_normal,
@@ -8,6 +13,7 @@ Sat Aug 8 17:03:21 2009 NARUSE, Yui <naruse@ruby-lang.org>
* encoding.c (enc_ascii_compatible_p): added. [ruby-core:24793]
(Init_Encoding): New API Encoding#ascii_compatible?.
+
Sun Aug 9 07:25:07 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/ripper/eventids2.c (token_to_eventid): added
diff --git a/common.mk b/common.mk
index de69872337..1f9b1ca9f1 100644
--- a/common.mk
+++ b/common.mk
@@ -86,11 +86,12 @@ COMMONOBJS = array.$(OBJEXT) \
$(BUILTIN_TRANSOBJS) \
$(MISSING)
-OBJS = dln.$(OBJEXT) \
+EXPORTOBJS = dln.$(OBJEXT) \
encoding.$(OBJEXT) \
- prelude.$(OBJEXT) \
$(COMMONOBJS)
+OBJS = $(EXPORTOBJS) prelude.$(OBJEXT)
+
GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb
@@ -168,8 +169,8 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
@$(RM) $@
$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
-ruby.imp: $(OBJS)
- @$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
+ruby.imp: $(EXPORTOBJS)
+ @$(NM) -Pgp $(EXPORTOBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
install: install-nodoc $(RDOCTARGET)
install-all: install-nodoc install-doc install-capi