From 69ee25f289cd5fe598c6e502adc3c2042d11d475 Mon Sep 17 00:00:00 2001
From: davygrvy <davygrvy@pobox.com>
Date: Wed, 27 Mar 2002 22:57:57 +0000
Subject: Clean targets made Win9x complient.

---
 win/buildall.vc.bat |  4 ++--
 win/makefile.vc     | 31 +++++++++++++++++--------------
 win/rmd.bat         | 21 ---------------------
 3 files changed, 19 insertions(+), 37 deletions(-)
 delete mode 100644 win/rmd.bat

diff --git a/win/buildall.vc.bat b/win/buildall.vc.bat
index c7709f5..84b4576 100755
--- a/win/buildall.vc.bat
+++ b/win/buildall.vc.bat
@@ -4,7 +4,7 @@
 ::  edit this (or make your own) for your needs and wants using
 ::  the instructions for calling makefile.vc found in makefile.vc
 ::
-::  RCS: @(#) $Id: buildall.vc.bat,v 1.4 2002/03/27 21:15:43 davygrvy Exp $
+::  RCS: @(#) $Id: buildall.vc.bat,v 1.5 2002/03/27 22:57:57 davygrvy Exp $
 
 echo Sit back and have a cup of coffee while this grinds through ;)
 echo You asked for *everything*, remember?
@@ -21,7 +21,7 @@ nmake -nologo -f makefile.vc core dlls OPTS=static,msvcrt
 if errorlevel 1 goto error
 nmake -nologo -f makefile.vc core OPTS=static,threads
 if errorlevel 1 goto error
-nmake -nologo -f makefile.vc dlls OPTS=static,msvcrt,threads
+nmake -nologo -f makefile.vc core dlls OPTS=static,msvcrt,threads
 if errorlevel 1 goto error
 nmake -nologo -f makefile.vc shell OPTS=threads
 if errorlevel 1 goto error
diff --git a/win/makefile.vc b/win/makefile.vc
index d552759..459b924 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
 # Copyright (c) 2001-2002 David Gravereaux.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.84 2002/03/27 21:15:43 davygrvy Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.85 2002/03/27 22:57:57 davygrvy Exp $
 #------------------------------------------------------------------------------
 
 !if "$(MSVCDIR)" == ""
@@ -191,8 +191,6 @@ TCLHLPCNT	= $(OUT_DIR)\$(TCLHLPBASE).cnt
 
 TCLTEST		= $(OUT_DIR)\$(PROJECT)test.exe
 CAT32		= $(OUT_DIR)\cat32.exe
-RMDIR		= .\rmd.bat
-RM		= del
 
 LIB_INSTALL_DIR		= $(INSTALLDIR)\lib
 BIN_INSTALL_DIR		= $(INSTALLDIR)\bin
@@ -409,10 +407,9 @@ TESTFLAGS = -file $(TESTPAT)
 release:    setup $(TCLSH) $(TCLSTUBLIB) dlls
 core:	    setup $(TCLLIB) $(TCLSTUBLIB)
 shell:	    setup $(TCLSH)
-dlls:	    setup $(TCLPIPEDLL) $(TCLREGDLL) $(TCLDDEDLL)
+dlls:	    setup $(TCLPIPEDLL) $(TCLREGLIB) $(TCLDDELIB)
 all:	    setup $(TCLSH) $(TCLSTUBLIB) dlls $(CAT32) 
 tcltest:    setup $(TCLTEST) dlls $(CAT32)
-plugin:	    setup $(TCLPLUGINDLL) $(TCLSHP)
 install:    install-binaries install-libraries
 
 
@@ -762,15 +759,21 @@ install-libraries:
 # Clean up
 #---------------------------------------------------------------------
 
+!if "$(OS)" == "Windows_NT"
+RMDIR	= rmdir /S /Q
+!else
+RMDIR	= deltree /Y
+!endif
+
 tidy:
-	-del $(TCLLIB)
-	-del $(TCLSH)
-	-del $(TCLTEST)
-	-del $(TCLDDELIB)
-	-del $(TCLREGLIB)
+	if exist $(TCLLIB) del $(TCLLIB)
+	if exist $(TCLSH) del $(TCLSH)
+	if exist $(TCLTEST) del $(TCLTEST)
+	if exist $(TCLDDELIB) del $(TCLDDELIB)
+	if exist $(TCLREGLIB) del $(TCLREGLIB)
 
-clean: tidy
-	-@$(RMDIR) $(TMP_DIR)
+clean:
+	if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR)
 
-hose: clean
-	-@$(RMDIR) $(OUT_DIR)
+hose:
+	if exist $(OUT_DIR)\nul $(RMDIR) $(OUT_DIR)
diff --git a/win/rmd.bat b/win/rmd.bat
deleted file mode 100644
index c4d154f..0000000
--- a/win/rmd.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-rem RCS: @(#) $Id: rmd.bat,v 1.8 2001/11/10 10:38:47 davygrvy Exp $
-
-if not exist %1\nul goto end
-
-echo Removing directory %1
-
-if "%OS%" == "Windows_NT" goto winnt
-
-deltree /y %1
-if errorlevel 1 goto end
-goto success
-
-:winnt
-rmdir /s /q %1
-if errorlevel 1 goto end
-
-:success
-echo Deleted directory %1
-
-:end
-- 
cgit v0.12