From 86689e037f26cfba91c54a89ccf352ab870c2cbe Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 5 Jul 2014 07:02:39 +0000
Subject: common.mk: empty by distclean

* common.mk (clean-runnable): remove files made by mkrunnable.

* common.mk (clean-extout): remove archir too.

* common.mk (clean-ext): remove timestamp directory

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46705 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 Makefile.in        | 1 -
 common.mk          | 9 ++++++++-
 win32/Makefile.sub | 3 ---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index df336c906b..fe5b7c15ae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -419,7 +419,6 @@ distclean-ext realclean-ext::
 	-$(Q)$(RMDIR) ext 2> /dev/null || true
 
 clean-extout:
-	-$(Q)$(RMDIRS) $(EXTOUT) 2> /dev/null || true
 
 clean-enc distclean-enc realclean-enc:
 	@test -f "$(ENC_MK)" || exit 0; \
diff --git a/common.mk b/common.mk
index 6dc1129e3c..5dcfff89f3 100644
--- a/common.mk
+++ b/common.mk
@@ -451,10 +451,15 @@ clear-installed-list: PHONY
 	@> $(INSTALLED_LIST) set MAKE="$(MAKE)"
 
 clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-capi clean-extout clean-platform
-clean-local:: PHONY
+clean-local:: clean-runnable
 	$(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
 	$(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
 	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h prelude.c config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT)
+	$(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb
+clean-runnable:: PHONY
+	$(Q)$(CHDIR) bin && $(exec) $(RM) $(PROGRAM) $(WPROGRAM) $(GORUBY)$(EXEEXT) bin/*.$(DLEXT)
+	$(Q)$(CHDIR) lib && $(exec) $(RM) $(LIBRUBY_A) $(LIBRUBY) $(LIBRUBY_ALIASES) $(RUBY_BASE_NAME)/$(RUBY_PROGRAM_VERSION) $(RUBY_BASE_NAME)/vendor_ruby
+	$(Q)$(RMDIR) lib/$(RUBY_BASE_NAME) lib bin
 clean-ext:: PHONY
 clean-golf: PHONY
 	$(Q)$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
@@ -462,6 +467,7 @@ clean-rdoc: PHONY
 clean-capi: PHONY
 clean-platform: PHONY
 clean-extout: PHONY
+	-$(Q)$(RMDIR) $(EXTOUT)/$(arch) $(EXTOUT) 2> $(NULL) || exit 0
 clean-docs: clean-rdoc clean-capi
 
 distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout distclean-platform
@@ -488,6 +494,7 @@ realclean-extout: distclean-extout
 clean-ext distclean-ext realclean-ext::
 	$(Q)$(RM) $(EXTS_MK)
 	$(Q)$(RM) $(EXTOUT)/.timestamp/.*.time
+	$(Q)$(RMDIR) $(EXTOUT)/.timestamp
 
 clean-enc distclean-enc realclean-enc: PHONY
 
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 9cc12e3778..0911fd0c87 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1029,9 +1029,6 @@ distclean-ext realclean-ext::
 		-$(Q)rmdir ext
 
 clean-extout:
-!if exist($(EXTOUT)/.)
-	-$(Q)$(RMDIRS) $(EXTOUT)
-!endif
 
 clean-enc distclean-enc realclean-enc:
 !if exist($(ENC_MK))
-- 
cgit v1.2.3