Skip to content

Commit a4511dc

Browse files
committed
Made clean target in Watcom makefiles work automatically on DOS systems.
1 parent bc79557 commit a4511dc

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

common.inc

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,17 @@ luac_obj = $(OBJDIR)$(SEP)luac.obj
2424

2525
!ifdef __UNIX__
2626
MD = mkdir -p
27+
RD = rm -rf --
2728
SEP = /
2829
!else
2930
MD = mkdir
31+
32+
!if "%OS%" == "Windows_NT"
33+
RD = rd /S /Q
34+
!else
35+
RD = deltree /Y
36+
!endif
37+
3038
SEP = \
3139
!endif
3240

@@ -64,13 +72,13 @@ $(SRCDIR)$(SEP)luac.c: luac$(SEP)luac.c
6472

6573
clean: .SYMBOLIC
6674
!ifdef __UNIX__
67-
@!if [ -e $(OBJDIR) ]; then rm -R $(OBJDIR); fi
75+
@!if [ -e $(OBJDIR) ]; then $(RD) $(OBJDIR); fi
6876
@!if [ -e $(BINDIR)LUA$(PLATFORM)$(SUFFIX) ]; then rm $(BINDIR)LUA$(PLATFORM)$(SUFFIX); fi
6977
@!if [ -e $(BINDIR)LUAC$(PLATFORM)$(SUFFIX) ]; then rm $(BINDIR)LUAC$(PLATFORM)$(SUFFIX); fi
7078
!else # Assuming DOS 5.0 +
7179
@!if exist $(BINDIR)$(SEP)LUA$(PLATFORM)$(SUFFIX) del $(BINDIR)$(SEP)LUA$(PLATFORM)$(SUFFIX)
7280
@!if exist $(BINDIR)$(SEP)LUAC$(PLATFORM)$(SUFFIX) del $(BINDIR)$(SEP)LUAC$(PLATFORM)$(SUFFIX)
73-
@!if exist $(OBJDIR)$(SEP)*.* echo Run `DEL $(OBJDIR)$(SEP)*.* && RD $(OBJDIR)` to clean compiler objects
81+
@!if exist $(OBJDIR)\nul $(RD) $(OBJDIR)
7482
!endif
7583

7684
dist:

0 commit comments

Comments
 (0)