diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-07 07:08:06 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-07-07 07:08:06 +0000 |
| commit | b1f4bf8aa272ffb291ece376b19fc205b1ec06f2 (patch) | |
| tree | c881c1d86437542f93adfb236a8bb2ef8329cff4 /win32/Makefile.sub | |
| parent | 8572ed5c0d98a8edaee7e0e433d632c3ca3f5821 (diff) | |
| download | ruby-b1f4bf8aa272ffb291ece376b19fc205b1ec06f2.tar.gz | |
common.mk: integrate clean targets
* common.mk (clean-rdoc, clean-capi, clean-platform): integrate
from Makefile.in and win32/Makefile.sub.
* win32/Makefile.sub (RMALL): now use rm.bat instead of rmall.bat
which does not handle any options and convert slashes.
* win32/rmall.bat: no longer used. use rm.bat with -r instead.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 0911fd0c87..37ae8283e7 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -75,7 +75,7 @@ IFCHANGE = $(COMSPEC) /C $(srcdir:/=\)\win32\ifchange.bat RM = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat RMDIR = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat RMDIRS = $(COMSPEC) /C $(srcdir:/=\)\win32\rmdirs.bat -RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rmall.bat +RMALL = $(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat -r MAKEDIRS = $(COMSPEC) /E:ON /C $(srcdir:/=\)\win32\makedirs.bat CP = copy > nul MV = move > nul @@ -817,7 +817,7 @@ s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t s,@RM@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rm.bat,;t t s,@RMDIR@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rmdirs.bat,:t t s,@RMDIRS@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rmdirs.bat,;t t -s,@RMALL@,$$(COMSPEC) /C rmdir /s /q,;t t +s,@RMALL@,$$(COMSPEC) /C $$(top_srcdir:/=\)\win32\rm.bat -f -r,:t t s,@MAKEDIRS@,$$(COMSPEC) /E:ON /C $$(top_srcdir:/=\)\win32\makedirs.bat,;t t s,@LIBOBJS@,$(LIBOBJS),;t t s,@ALLOCA@,$(ALLOCA),;t t @@ -1002,15 +1002,6 @@ distclean-local:: -$(Q)$(RM) $(INSTALLED_LIST:/=\) $(arch_hdrdir:/=\)\ruby\config.h verconf.h -$(Q)$(RMDIRS) $(arch_hdrdir:/=\)\ruby -clean-rdoc distclean-rdoc realclean-rdoc: - -$(Q)$(RMALL) $(RDOCOUT:/=\) -clean-capi distclean-capi realclean-capi: - -$(Q)$(RMALL) $(CAPIOUT:/=\) - -clean-platform: - $(Q)$(RM) $(PLATFORM_D:/=\) - -$(Q)$(RMDIR) $(PLATFORM_DIR:/=\) - clean-ext distclean-ext realclean-ext:: !if "$(EXTS)" != "" @for %I in ($(EXTS)) \ |