From b9127221e5c28ab677c56fc5885259e90647e2a8 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 7 Jan 2008 06:53:39 +0000 Subject: [PATCH] * 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ Makefile.in | 1 + bcc32/Makefile.sub | 1 + common.mk | 1 - win32/Makefile.sub | 1 + wince/Makefile.sub | 1 + 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bb198812a8..8bf914c392 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jan 7 15:42:46 2008 NAKAMURA Usaku + + * 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 * re.c (rb_reg_preprocess): fix fixed_enc condition. diff --git a/Makefile.in b/Makefile.in index d4da5d62bd..8459cc2780 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 291a655094..317ad2092c 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 ed3c6f2d6a..1b2c3881f8 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 e9b1d10427..4a22eef1ac 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 06baa5dcfd..64e5ffb5c4 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 \