summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in1
-rw-r--r--bcc32/Makefile.sub1
-rw-r--r--common.mk1
-rw-r--r--win32/Makefile.sub1
-rw-r--r--wince/Makefile.sub1
6 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bb198812a82..8bf914c392b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 7 15:42:46 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * common.mk, Makefile.in, */Makefile.sub (distclean-local): move
+ removing rule of ext/ripper/y.output from common.mk to Makefiles
+ that depend on platforms.
+
Mon Jan 7 13:54:57 2008 Tanaka Akira <akr@fsij.org>
* re.c (rb_reg_preprocess): fix fixed_enc condition.
diff --git a/Makefile.in b/Makefile.in
index d4da5d62bd0..8459cc27806 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -196,6 +196,7 @@ clean-local::
distclean-local::
@$(RM) ext/config.cache $(RBCONFIG)
+ @-$(RM) ext/ripper/y.output
ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 291a6550942..317ad2092ce 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -518,6 +518,7 @@ distclean-local::
@$(RM) ext\config.cache $(RBCONFIG:/=\)
@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF)
@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
+ @-$(RM) ext\ripper\y.output
ext/extinit.obj: ext/extinit.c $(SETUP)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
diff --git a/common.mk b/common.mk
index ed3c6f2d6aa..1b2c3881f8e 100644
--- a/common.mk
+++ b/common.mk
@@ -315,7 +315,6 @@ distclean-local:: clean-local
@$(RM) $(MKFILES) config.h rbconfig.rb yasmdata.rb
@$(RM) config.cache config.log config.status config.status.lineno $(PRELUDES)
@$(RM) *~ *.bak *.stackdump core *.core gmon.out y.tab.c y.output $(PREP)
- @-$(RM) ext/ripper/y.output
distclean-ext:
@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) distclean
# -$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index e9b1d104275..4a22eef1acb 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -556,6 +556,7 @@ distclean-local::
@$(RM) ext\config.cache $(RBCONFIG:/=\) $(CONFIG_H:/=\)
@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF)
@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
+ @-$(RM) ext\ripper\y.output
$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG)
@$(MINIRUBY) $(srcdir)/win32/resource.rb \
diff --git a/wince/Makefile.sub b/wince/Makefile.sub
index 06baa5dcfdd..64e5ffb5c40 100644
--- a/wince/Makefile.sub
+++ b/wince/Makefile.sub
@@ -489,6 +489,7 @@ distclean-local::
@$(RM) ext\config.cache $(RBCONFIG:/=\)
@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF)
@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
+ @-$(RM) ext\ripper\y.output
$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: $(RBCONFIG)
@$(MINIRUBY) $(srcdir)/win32/resource.rb \