summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in3
-rw-r--r--bcc32/Makefile.sub3
-rw-r--r--common.mk4
-rw-r--r--win32/Makefile.sub3
5 files changed, 10 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 853e1d8db8..7cafecaa94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb 24 23:29:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk, {bcc,win}32/Makefile.sub (clean-local): remove
+ intermediate files.
+
Sun Feb 24 06:49:12 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* debug.c (ruby_set_debug_option): separated ruby_each_words().
diff --git a/Makefile.in b/Makefile.in
index a4560ea2c5..09275ce4c8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -194,11 +194,10 @@ lex.c: keywords
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $<
clean-local::
- @$(RM) ext/extinit.c ext/extinit.$(OBJEXT)
+ @$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output
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 c07420f0d4..3a35952162 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -517,12 +517,11 @@ post-install-doc::
clean-local::
@$(RM) 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
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 d6c0331dbb..1da20972d6 100644
--- a/common.mk
+++ b/common.mk
@@ -310,7 +310,7 @@ clean: clean-ext clean-local clean-enc
clean-local::
@$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
- @$(RM) *.inc $(GOLFOBJS)
+ @$(RM) *.inc $(GOLFOBJS) y.tab.c y.output
clean-ext:
@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) clean
clean-enc:
@@ -320,7 +320,7 @@ distclean: distclean-ext distclean-local distclean-enc
distclean-local:: clean-local
@$(RM) $(MKFILES) config.h rbconfig.rb yasmdata.rb encdb.h
@$(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) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
distclean-ext:
@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) distclean
# -$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index a2578d0274..ceb867e6a4 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -659,12 +659,11 @@ $(RUBYDEF): $(LIBRUBY_A) $(PREP)
clean-local::
@$(RM) 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
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) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
@$(MINIRUBY) $(srcdir)/win32/resource.rb \