Skip to content

Commit adbbc91

Browse files
committed
Win32: Update clean commands for bundled gems
1 parent e109400 commit adbbc91

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

win32/Makefile.sub

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,10 +1281,19 @@ distclean-local::
12811281
-$(Q)$(RMDIRS) $(arch_hdrdir:/=\)\ruby
12821282
-$(Q)$(RMDIR) win32
12831283

1284+
.bundle/clean:: .bundle/clean.sub
1285+
.bundle/distclean:: .bundle/distclean.sub
1286+
.bundle/realclean:: .bundle/realclean.sub
1287+
1288+
.bundle/clean.sub:: ext/clean.mk
1289+
.bundle/distclean.sub:: ext/distclean.mk
1290+
.bundle/realclean.sub:: ext/realclean.mk
1291+
12841292
ext/clean.mk ext/distclean.mk ext/realclean.mk::
12851293
$(Q)if exist $(EXTS_MK) $(MAKE) -k -f $(EXTS_MK) top_srcdir=$(srcdir) $(*F)
12861294

1287-
ext/clean gems/clean ext/distclean gems/distclean ext/realclean gems/realclean::
1295+
ext/clean.sub ext/distclean.sub ext/realclean.sub \
1296+
.bundle/clean.sub .bundle/distclean.sub .bundle/realclean.sub::
12881297
$(Q)cd $(@D) 2>nul && (for /R $(EXTS) %I in (.) \
12891298
do $(Q)if exist %I\Makefile ( \
12901299
cd %I && ( \
@@ -1297,11 +1306,14 @@ ext/clean gems/clean ext/distclean gems/distclean ext/realclean gems/realclean::
12971306
$(RMDIRS) %I \
12981307
))) || @
12991308

1300-
ext/distclean gems/distclean ext/realclean gems/realclean::
1309+
ext/distclean ext/realclean .bundle/distclean .bundle/realclean::
13011310
$(Q)cd $(@D) 2>nul && (for /R $(EXTS) %I in (exts.mk*) \
13021311
do $(Q)(del %I & rmdir %~dpI)) || @
13031312
-$(Q)rmdir $(@D) 2> nul || @
13041313

1314+
.bundle/realclean::
1315+
@$(RMALL) $(tooldir)/bunlder/*.lock $(srcdir)/.bundle
1316+
13051317
gc/clean gc/distclean gc/realclean::
13061318
- for /D %G in (gc\*) do (pushd %G && $(MAKE) TARGET_SO_DIR=./ $(@F) & popd) || $(NULLCMD)
13071319
gc/distclean gc/realclean::

0 commit comments

Comments
 (0)