summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-19 13:44:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-19 13:44:06 +0000
commit83e274d46df99b2c0880f47cfe5d52308029feae (patch)
tree8ba7ca2ff88762466f961720a4de84f4a3695cfa
parent8565b62aef0d48f6f271157d606f2014f22581c5 (diff)
* cygwin/GNUmakefile.in, win32/Makefile.sub (clean): rc files are
made at compile time, so should be removed by clean. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29837 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--cygwin/GNUmakefile.in2
-rw-r--r--win32/Makefile.sub2
3 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8813af5559..f144be3637 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Nov 19 22:44:04 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * cygwin/GNUmakefile.in, win32/Makefile.sub (clean): rc files are
+ made at compile time, so should be removed by clean.
+
Fri Nov 19 22:09:46 2010 Kouhei Sutou <kou@cozmixng.org>
* test/rexml/test_core.rb
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 1a49b0eca4..1eb8880ba9 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -102,6 +102,4 @@ endif
clean-local::
@$(RM) $(RUBY_EXP) $(RCFILES:.rc=.res.@OBJEXT@)
-
-distclean-local::
@$(RM) $(RCFILES)
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index b0a32dec55..2fd0e236b8 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -883,11 +883,11 @@ $(RUBYDEF): $(LIBRUBY_A) $(PREP)
clean-local::
@$(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) miniruby.rc $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF) ext\ripper\y.output
distclean-local::
@$(RM) ext\config.cache $(RBCONFIG:/=\) $(CONFIG_H:/=\)
- @$(RM) miniruby.rc $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
@-$(RM) $(INSTALLED_LIST:/=\) $(arch_hdrdir:/=\)\ruby\config.h
@-$(RMDIRS) $(arch_hdrdir:/=\)\ruby