summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-11 12:15:50 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-11 12:15:50 +0000
commitfe9dfcf964c52e618196049e4d22ccf173f7dbfb (patch)
tree470f6031cd260ca6c4cbf3c6f5bebc3eeacea238
parentf318e63a8a4bd25fff11aab7883057314d471067 (diff)
downloadruby-fe9dfcf964c52e618196049e4d22ccf173f7dbfb.tar.gz
ruby-fe9dfcf964c52e618196049e4d22ccf173f7dbfb.tar.xz
ruby-fe9dfcf964c52e618196049e4d22ccf173f7dbfb.zip
revert previous commit.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13885 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in2
2 files changed, 1 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b754a628d..e4186b519 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Sun Nov 11 20:53:46 2007 Tanaka Akira <akr@fsij.org>
-
- * Makefile.in (miniruby): use $(LIBRUBY_A) with prelude.$(OBJEXT).
-
Sun Nov 11 20:32:45 2007 Tanaka Akira <akr@fsij.org>
* {win32,wince,bcc32}/Makefile.sub: delete lex.c rule.
diff --git a/Makefile.in b/Makefile.in
index 467b84c54..b697cd804 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,7 +105,7 @@ all:
miniruby$(EXEEXT):
@$(RM) $@
- $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) prelude.$(OBJEXT) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@
+ $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(OBJS) prelude.$(OBJEXT) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@
$(PROGRAM):
@$(RM) $@