summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-11 03:39:55 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-11 03:39:55 +0000
commit6a76630b3c7e85cfd97af77f288321a2f80dcc27 (patch)
tree82f37fdb44c9ada4e30498204105e6d237f7dc68
parent3e5171559644a5a07bb43fc0cc8735b0614cb2a1 (diff)
* common.mk (clean-local): WINMAINOBJ is Windows specific.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--bcc32/Makefile.sub2
-rw-r--r--common.mk2
-rw-r--r--win32/Makefile.sub2
4 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 90817b8054..e4d129168b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Mar 11 12:39:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (clean-local): WINMAINOBJ is Windows specific.
+
Tue Mar 11 10:19:10 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (hash): replaced by MurmurHash described in
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 9652504c6e..f358891bd2 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -515,7 +515,7 @@ post-install-doc::
@$(NULLCMD)
clean-local::
- @$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib
+ @$(RM) $(WINMAINOBJ) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib
@$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res
@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF) ext\ripper\y.output
diff --git a/common.mk b/common.mk
index 1da20972d6..9838fe23ae 100644
--- a/common.mk
+++ b/common.mk
@@ -308,7 +308,7 @@ clear-installed-list:
clean: clean-ext clean-local clean-enc
clean-local::
- @$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
+ @$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
@$(RM) *.inc $(GOLFOBJS) y.tab.c y.output
clean-ext:
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index b5f7a0d40c..88f8008e9d 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -657,7 +657,7 @@ $(RUBYDEF): $(LIBRUBY_A) $(PREP)
$(AR) $(ARFLAGS)$@ -def:$<
clean-local::
- @$(RM) ext\extinit.c ext\extinit.$(OBJEXT) ext\vc*.pdb miniruby.lib
+ @$(RM) $(WINMAINOBJ) ext\extinit.c ext\extinit.$(OBJEXT) ext\vc*.pdb miniruby.lib
@$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res
@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF) ext\ripper\y.output