From eff82a243d01d4af019ff2552bd7c6eecb1f72ef Mon Sep 17 00:00:00 2001
From: Paul Tucker <ptucker@sympatico.ca>
Date: Wed, 6 Nov 2002 05:29:47 +0000
Subject: [PATCH] See Changelog 2002-11-07 00:00 UTC-0500

---
 harbour/ChangeLog   | 10 +++++++-
 harbour/make_vc.bat | 33 +++++++++++++++-----------
 harbour/makefile.nt | 56 ++++++++++++++++++++++++---------------------
 harbour/makefile.vc | 56 ++++++++++++++++++++++++---------------------
 4 files changed, 89 insertions(+), 66 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d3105b2b9a..06c80fb06c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2002-11-06 00:00 UTC-0500 Paul Tucker <ptucker@sympatico.ca>
+  * makefile.vc
+  * makefile.nt
+  * make_vc.bat
+    * clean now handled by make
+    * corrected param handling
+    * use /? for help
+
 2002-11-05 21:41 UTC-0300 Luiz Rafael Culik <culikr@uol.com.br>
   * source/rtl/alert.prg
     ! Fixed problem when Text to display has more then 60 chars and the Line Breaker character (;) dont exist
@@ -44,7 +52,7 @@
   * makefile.vc
     * no more recursive nmake calls
   * makefile.nt
-    * corrected on batch mode call
+    * corrected one batch mode call
   * make_vc.bat
     * if building Harbour under NT, use the alternate makefile.nt
     * for faster builds.
diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat
index 45f760a063..81a5ee2407 100644
--- a/harbour/make_vc.bat
+++ b/harbour/make_vc.bat
@@ -11,6 +11,19 @@ rem Instead, make a local copy and modify that one, or make a call to
 rem this batch file from your customized one. [vszakats]
 rem ---------------------------------------------------------------
 
+set rem=rem
+if "%1"=="/?" set rem=echo.
+%rem% ---------------------------------------------------------------
+%rem% Usage: make_vc [/y] [/a or CLEAN or other specific target]
+%rem% Call with nothing, /Y, /A, or CLEAN
+%rem% nothing - compiles what needs it.
+%rem% CLEAN, delete targets.
+%rem% /A clean, then compile all
+%rem% /Y non batch mode (forces makefile.vc)
+%rem% ---------------------------------------------------------------
+set rem=
+if "%1"=="/?" goto exit
+
 if not exist obj md obj
 if not exist obj\vc md obj\vc
 if not exist lib md lib
@@ -18,16 +31,16 @@ if not exist lib\vc md lib\vc
 if not exist bin md bin
 if not exist bin\vc md bin\vc
 
-if "%1" == "clean" goto CLEAN
-if "%1" == "CLEAN" goto CLEAN
 set MK_FILE=makefile.vc
 if "%OS%" == "Windows_NT" set MK_FILE=makefile.nt
 if "%1" == "/Y" set MK_FILE=makefile.vc
 if "%1" == "/y" set MK_FILE=makefile.vc
+if "%1" == "clean" goto CLEAN
+if "%1" == "CLEAN" goto CLEAN
 
 :BUILD
 
-   nmake /f%MK_FILE% %1 %2 %3 > make_vc.log
+   nmake /f %MK_FILE% %1 %2 %3 > make_vc.log
    if errorlevel 1 goto BUILD_ERR
 
 :BUILD_OK
@@ -43,16 +56,10 @@ if "%1" == "/y" set MK_FILE=makefile.vc
 
 :CLEAN
 
-   if exist bin\vc\*.exe del bin\vc\*.exe
-   if exist bin\vc\*.pdb del bin\vc\*.pdb
-   if exist bin\vc\*.ilk del bin\vc\*.ilk
-   if exist bin\vc\*.map del bin\vc\*.map
-   if exist lib\vc\*.lib del lib\vc\*.lib
-   if exist obj\vc\*.obj del obj\vc\*.obj
-   if exist obj\vc\*.c   del obj\vc\*.c
-   if exist obj\vc\*.h   del obj\vc\*.h
-   if exist obj\vc\*.pch del obj\vc\*.pch
-   if exist make_vc.log  del make_vc.log
+   nmake /f %MK_FILE% %1
+   rem in this case, the makefile handles most cleanup. Add what you need here
+   if exist make_vc.log del make_vc.log
+   rem etc.
 
 :EXIT
 SET MK_FILE=
diff --git a/harbour/makefile.nt b/harbour/makefile.nt
index 8025830cb1..bf235924ab 100644
--- a/harbour/makefile.nt
+++ b/harbour/makefile.nt
@@ -435,7 +435,7 @@ RTL_LIB_OBJS = \
 #
 
 {$(LANG_DIR)}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 LANG_LIB_OBJS = \
    $(OBJ_DIR)\msgca.obj \
@@ -479,7 +479,7 @@ LANG_LIB_OBJS = \
 #
 
 {$(CODEPAGE_DIR)}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 CODEPAGE_LIB_OBJS = \
    $(OBJ_DIR)\cdpru866.obj \
@@ -492,7 +492,7 @@ CODEPAGE_LIB_OBJS = \
 #
 
 {$(MACRO_DIR)}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 MACRO_LIB_OBJS = \
    $(OBJ_DIR)\macroy.obj \
@@ -515,7 +515,7 @@ MACRO_LIB_OBJS = \
 #
 
 {$(RDD_DIR)}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 {$(RDD_DIR)}.prg{$(OBJ_DIR)}.obj::
    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
@@ -547,7 +547,7 @@ RDD_LIB_OBJS = \
 #
 
 {$(RDD_DIR)\nulsys}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 {$(RDD_DIR)\nulsys}.prg{$(OBJ_DIR)}.obj::
    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
@@ -561,7 +561,7 @@ NULSYS_LIB_OBJS = \
 #
 
 {$(RDD_DIR)\dbfntx}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 {$(RDD_DIR)\dbfntx}.prg{$(OBJ_DIR)}.obj::
    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
@@ -577,7 +577,7 @@ DBFNTX_LIB_OBJS = \
 #
 
 {$(RDD_DIR)\dbfcdx}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 {$(RDD_DIR)\dbfcdx}.prg{$(OBJ_DIR)}.obj::
    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
@@ -593,7 +593,7 @@ DBFCDX_LIB_OBJS = \
 #
 
 {$(PP_DIR)}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 PP_LIB_OBJS = \
    $(OBJ_DIR)\ppcore.obj \
@@ -607,7 +607,7 @@ PP_LIB_OBJS = \
 #
 
 {$(DEBUG_DIR)}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 {$(DEBUG_DIR)}.prg{$(OBJ_DIR)}.obj::
    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
@@ -630,7 +630,7 @@ DEBUG_LIB_OBJS = \
 #
 
 {$(COMMON_DIR)}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 COMMON_LIB_OBJS = \
    $(OBJ_DIR)\hbffind.obj \
@@ -650,7 +650,7 @@ COMMON_LIB_OBJS = \
 #
 
 {$(VM_DIR)}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 {$(VM_DIR)}.prg{$(OBJ_DIR)}.obj::
    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
@@ -694,7 +694,7 @@ VM_LIB_OBJS = \
 #
 
 {$(RTL_DIR)\gtcgi}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 GTCGI_LIB_OBJS = \
    $(OBJ_DIR)\gtcgi.obj \
@@ -705,7 +705,7 @@ GTCGI_LIB_OBJS = \
 #
 
 {$(RTL_DIR)\gtdos}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 GTDOS_LIB_OBJS = \
    $(OBJ_DIR)\gtdos.obj \
@@ -716,7 +716,7 @@ GTDOS_LIB_OBJS = \
 #
 
 {$(RTL_DIR)\gtpca}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 GTPCA_LIB_OBJS = \
    $(OBJ_DIR)\gtpca.obj \
@@ -727,7 +727,7 @@ GTPCA_LIB_OBJS = \
 #
 
 {$(RTL_DIR)\gtstd}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 GTSTD_LIB_OBJS = \
    $(OBJ_DIR)\gtstd.obj \
@@ -738,7 +738,7 @@ GTSTD_LIB_OBJS = \
 #
 
 {$(RTL_DIR)\gtwin}.c{$(OBJ_DIR)}.obj::
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 GTWIN_LIB_OBJS = \
    $(OBJ_DIR)\gtwin.obj \
@@ -748,10 +748,10 @@ GTWIN_LIB_OBJS = \
 # Our default target
 #
 
+!if ( "$(MK_FLAGS:Y=)"=="A" )
 
-!if ( "$(MK_FLAGS)"=="A" )
-
-all: zot \
+all: \
+   CLEAN \
    $(COMMON_LIB) \
    $(PP_LIB) \
    $(HARBOUR_EXE) \
@@ -774,13 +774,6 @@ all: zot \
 
 MK_FLAGS = $(MK_FLAGS:A=)
 
-zot:
-   -@if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul
-   -@if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul
-   -@if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > nul
-   -@if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul
-   -@if exist $(BIN_DIR)\*.map $(DEL) $(BIN_DIR)\*.map > nul
-
 !else
 
 all: \
@@ -806,6 +799,17 @@ all: \
 
 !endif
 
+CLEAN:
+   -@if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul
+   -@if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul
+   -@if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > nul
+   -@if exist $(OBJ_DIR)\*.pch $(DEL) $(OBJ_DIR)\*.pch > nul
+   -@if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul
+   -@if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul
+   -@if exist $(BIN_DIR)\*.pdb $(DEL) $(BIN_DIR)\*.pdb > nul
+   -@if exist $(BIN_DIR)\*.ilk $(DEL) $(BIN_DIR)\*.ilk > nul
+   -@if exist $(BIN_DIR)\*.map $(DEL) $(BIN_DIR)\*.map > nul
+
 $(HBPP_EXE) : \
    $(HBPP_DIR)\hbpp.c
    $(CC) $(CFLAGS) -Fo$(OBJ_DIR)\  $** -o $(HBPP_EXE) /link $(LDFLAGS) $(PP_LIB) $(COMMON_LIB)
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index 21ebfb314d..31d2750f83 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -399,7 +399,7 @@ RTL_LIB_OBJS = \
 #
 
 {$(LANG_DIR)}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 LANG_LIB_OBJS = \
    $(OBJ_DIR)\msgca.obj \
@@ -443,7 +443,7 @@ LANG_LIB_OBJS = \
 #
 
 {$(CODEPAGE_DIR)}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 CODEPAGE_LIB_OBJS = \
    $(OBJ_DIR)\cdpru866.obj \
@@ -455,7 +455,7 @@ CODEPAGE_LIB_OBJS = \
 #
 
 {$(MACRO_DIR)}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 MACRO_LIB_OBJS = \
    $(OBJ_DIR)\macroy.obj \
@@ -478,7 +478,7 @@ MACRO_LIB_OBJS = \
 #
 
 {$(RDD_DIR)}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 {$(RDD_DIR)}.prg{$(OBJ_DIR)}.obj:
    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
@@ -510,7 +510,7 @@ RDD_LIB_OBJS = \
 #
 
 {$(RDD_DIR)\nulsys}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 {$(RDD_DIR)\nulsys}.prg{$(OBJ_DIR)}.obj:
    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
@@ -524,7 +524,7 @@ NULSYS_LIB_OBJS = \
 #
 
 {$(RDD_DIR)\dbfntx}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 {$(RDD_DIR)\dbfntx}.prg{$(OBJ_DIR)}.obj:
    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
@@ -540,7 +540,7 @@ DBFNTX_LIB_OBJS = \
 #
 
 {$(RDD_DIR)\dbfcdx}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 {$(RDD_DIR)\dbfcdx}.prg{$(OBJ_DIR)}.obj:
    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
@@ -556,7 +556,7 @@ DBFCDX_LIB_OBJS = \
 #
 
 {$(PP_DIR)}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 PP_LIB_OBJS = \
    $(OBJ_DIR)\ppcore.obj \
@@ -570,7 +570,7 @@ PP_LIB_OBJS = \
 #
 
 {$(DEBUG_DIR)}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 {$(DEBUG_DIR)}.prg{$(OBJ_DIR)}.obj:
    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
@@ -593,7 +593,7 @@ DEBUG_LIB_OBJS = \
 #
 
 {$(COMMON_DIR)}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 COMMON_LIB_OBJS = \
    $(OBJ_DIR)\hbffind.obj \
@@ -613,7 +613,7 @@ COMMON_LIB_OBJS = \
 #
 
 {$(VM_DIR)}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 {$(VM_DIR)}.prg{$(OBJ_DIR)}.obj:
    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
@@ -657,7 +657,7 @@ VM_LIB_OBJS = \
 #
 
 {$(RTL_DIR)\gtcgi}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 GTCGI_LIB_OBJS = \
    $(OBJ_DIR)\gtcgi.obj \
@@ -668,7 +668,7 @@ GTCGI_LIB_OBJS = \
 #
 
 {$(RTL_DIR)\gtdos}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 GTDOS_LIB_OBJS = \
    $(OBJ_DIR)\gtdos.obj \
@@ -679,7 +679,7 @@ GTDOS_LIB_OBJS = \
 #
 
 {$(RTL_DIR)\gtpca}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 GTPCA_LIB_OBJS = \
    $(OBJ_DIR)\gtpca.obj \
@@ -690,7 +690,7 @@ GTPCA_LIB_OBJS = \
 #
 
 {$(RTL_DIR)\gtstd}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 GTSTD_LIB_OBJS = \
    $(OBJ_DIR)\gtstd.obj \
@@ -701,7 +701,7 @@ GTSTD_LIB_OBJS = \
 #
 
 {$(RTL_DIR)\gtwin}.c{$(OBJ_DIR)}.obj:
-   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\  $<
+   $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $<
 
 GTWIN_LIB_OBJS = \
    $(OBJ_DIR)\gtwin.obj \
@@ -711,10 +711,10 @@ GTWIN_LIB_OBJS = \
 # Our default target
 #
 
+!if ( "$(MK_FLAGS:Y=)"=="A" )
 
-!if ( "$(MK_FLAGS)"=="A" )
-
-all: zot \
+all: \
+   CLEAN \
    $(COMMON_LIB) \
    $(PP_LIB) \
    $(HARBOUR_EXE) \
@@ -737,13 +737,6 @@ all: zot \
 
 MK_FLAGS = $(MK_FLAGS:A=)
 
-zot:
-   -@if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul
-   -@if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul
-   -@if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > nul
-   -@if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul
-   -@if exist $(BIN_DIR)\*.map $(DEL) $(BIN_DIR)\*.map > nul
-
 !else
 
 all: \
@@ -769,6 +762,17 @@ all: \
 
 !endif
 
+CLEAN:
+   -@if exist $(OBJ_DIR)\*.obj $(DEL) $(OBJ_DIR)\*.obj > nul
+   -@if exist $(OBJ_DIR)\*.c $(DEL) $(OBJ_DIR)\*.c > nul
+   -@if exist $(OBJ_DIR)\*.h $(DEL) $(OBJ_DIR)\*.h > nul
+   -@if exist $(OBJ_DIR)\*.pch $(DEL) $(OBJ_DIR)\*.pch > nul
+   -@if exist $(LIB_DIR)\*.lib $(DEL) $(LIB_DIR)\*.lib > nul
+   -@if exist $(BIN_DIR)\*.exe $(DEL) $(BIN_DIR)\*.exe > nul
+   -@if exist $(BIN_DIR)\*.pdb $(DEL) $(BIN_DIR)\*.pdb > nul
+   -@if exist $(BIN_DIR)\*.ilk $(DEL) $(BIN_DIR)\*.ilk > nul
+   -@if exist $(BIN_DIR)\*.map $(DEL) $(BIN_DIR)\*.map > nul
+
 $(HBPP_EXE) : \
    $(HBPP_DIR)\hbpp.c
    $(CC) $(CFLAGS) -Fo$(OBJ_DIR)\  $** -o $(HBPP_EXE) /link $(LDFLAGS) $(PP_LIB) $(COMMON_LIB)