Latest release from Cyclic Software

13 files changed, 1100 insertions, 21 deletions

diff --git a/gnu/usr.bin/cvs/ChangeLog b/gnu/usr.bin/cvs/ChangeLog
index 3c4bfc72579..263d0782b82 100644
--- a/gnu/usr.bin/cvs/ChangeLog
+++ b/gnu/usr.bin/cvs/ChangeLog
@@ -1,3 +1,15 @@
+Wed Mar 19 14:06:40 1997  Jim Meyering  <meyering@totoro.cyclic.com>
+
+	* configure.in (test for shadow passwords): Use AC_MSG_RESULT
+ 	rather than echo, so configure obeys --quiet.
+	Use yes and no in message rather than yup and nope.
+
+19 Mar 1997  Jim Kingdon
+
+	* cvsnt.mak: Now Visual C++ wants to add a bunch of dependencies
+	for the Release configuration as well as the Debug one.  Why it
+	didn't do this before, I have no idea.
+
 13 Mar 1997  Jim Kingdon
 
 	* cvsnt.mak: Recent changes have added a number of getline.h
diff --git a/gnu/usr.bin/cvs/cvsnt.mak b/gnu/usr.bin/cvs/cvsnt.mak
index cfa7575b401..c3de608ee1c 100644
--- a/gnu/usr.bin/cvs/cvsnt.mak
+++ b/gnu/usr.bin/cvs/cvsnt.mak
@@ -534,6 +534,21 @@ LINK32_OBJS= \
 # Begin Source File
 
 SOURCE=.\src\mkmodules.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_MKMOD=\
+	".\src\cvs.h"\
+	".\lib\savecwd.h"\
+	".\lib\getline.h"\
+	
+
+"$(INTDIR)\mkmodules.obj" : $(SOURCE) $(DEP_CPP_MKMOD) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_MKMOD=\
 	".\src\cvs.h"\
 	".\lib\savecwd.h"\
@@ -567,11 +582,27 @@ NODEP_CPP_MKMOD=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\subr.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_SUBR_=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	
+
+"$(INTDIR)\subr.obj" : $(SOURCE) $(DEP_CPP_SUBR_) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_SUBR_=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -604,11 +635,26 @@ NODEP_CPP_SUBR_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\admin.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_ADMIN=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\admin.obj" : $(SOURCE) $(DEP_CPP_ADMIN) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_ADMIN=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -640,11 +686,32 @@ NODEP_CPP_ADMIN=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\server.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_SERVE=\
+	".\src\cvs.h"\
+	".\src\watch.h"\
+	".\src\edit.h"\
+	".\src\fileattr.h"\
+	".\lib\getline.h"\
+	".\src\buffer.h"\
+	{$(INCLUDE)}"\sys\Types.h"\
+	
+
+"$(INTDIR)\server.obj" : $(SOURCE) $(DEP_CPP_SERVE) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_SERVE=\
 	".\src\cvs.h"\
 	".\src\watch.h"\
@@ -681,11 +748,26 @@ NODEP_CPP_SERVE=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\diff.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_DIFF_=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\diff.obj" : $(SOURCE) $(DEP_CPP_DIFF_) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_DIFF_=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -717,11 +799,31 @@ NODEP_CPP_DIFF_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\client.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_CLIEN=\
+	".\windows-NT\config.h"\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	".\src\edit.h"\
+	".\src\buffer.h"\
+	".\lib\md5.h"\
+	
+
+"$(INTDIR)\client.obj" : $(SOURCE) $(DEP_CPP_CLIEN) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_CLIEN=\
 	".\windows-NT\config.h"\
 	".\src\cvs.h"\
@@ -757,11 +859,26 @@ NODEP_CPP_CLIEN=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\checkout.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_CHECK=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\checkout.obj" : $(SOURCE) $(DEP_CPP_CHECK) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_CHECK=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -793,11 +910,26 @@ NODEP_CPP_CHECK=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\no_diff.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_NO_DI=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\no_diff.obj" : $(SOURCE) $(DEP_CPP_NO_DI) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_NO_DI=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -829,11 +961,27 @@ NODEP_CPP_NO_DI=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\entries.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_ENTRI=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	
+
+"$(INTDIR)\entries.obj" : $(SOURCE) $(DEP_CPP_ENTRI) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_ENTRI=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -866,11 +1014,27 @@ NODEP_CPP_ENTRI=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\tag.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_TAG_C=\
+	".\src\cvs.h"\
+	".\lib\savecwd.h"\
+	
+
+"$(INTDIR)\tag.obj" : $(SOURCE) $(DEP_CPP_TAG_C) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_TAG_C=\
 	".\src\cvs.h"\
 	".\lib\savecwd.h"\
@@ -903,11 +1067,26 @@ NODEP_CPP_TAG_C=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\rtag.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_RTAG_=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\rtag.obj" : $(SOURCE) $(DEP_CPP_RTAG_) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_RTAG_=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -939,11 +1118,26 @@ NODEP_CPP_RTAG_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\status.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_STATU=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\status.obj" : $(SOURCE) $(DEP_CPP_STATU) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_STATU=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -975,11 +1169,27 @@ NODEP_CPP_STATU=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\root.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_ROOT_=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	
+
+"$(INTDIR)\root.obj" : $(SOURCE) $(DEP_CPP_ROOT_) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_ROOT_=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -1012,11 +1222,27 @@ NODEP_CPP_ROOT_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\myndbm.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_MYNDB=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	
+
+"$(INTDIR)\myndbm.obj" : $(SOURCE) $(DEP_CPP_MYNDB) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_MYNDB=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -1049,11 +1275,26 @@ NODEP_CPP_MYNDB=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\hash.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_HASH_=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\hash.obj" : $(SOURCE) $(DEP_CPP_HASH_) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_HASH_=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -1085,11 +1326,27 @@ NODEP_CPP_HASH_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\repos.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_REPOS=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	
+
+"$(INTDIR)\repos.obj" : $(SOURCE) $(DEP_CPP_REPOS) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_REPOS=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -1122,11 +1379,27 @@ NODEP_CPP_REPOS=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\parseinfo.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_PARSE=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	
+
+"$(INTDIR)\parseinfo.obj" : $(SOURCE) $(DEP_CPP_PARSE) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_PARSE=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -1159,11 +1432,26 @@ NODEP_CPP_PARSE=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\vers_ts.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_VERS_=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\vers_ts.obj" : $(SOURCE) $(DEP_CPP_VERS_) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_VERS_=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -1195,11 +1483,28 @@ NODEP_CPP_VERS_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\checkin.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_CHECKI=\
+	".\src\cvs.h"\
+	".\src\fileattr.h"\
+	".\src\edit.h"\
+	
+
+"$(INTDIR)\checkin.obj" : $(SOURCE) $(DEP_CPP_CHECKI) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_CHECKI=\
 	".\src\cvs.h"\
 	".\src\fileattr.h"\
@@ -1233,11 +1538,29 @@ NODEP_CPP_CHECKI=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\commit.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_COMMI=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	".\src\edit.h"\
+	".\src\fileattr.h"\
+	
+
+"$(INTDIR)\commit.obj" : $(SOURCE) $(DEP_CPP_COMMI) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_COMMI=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -1272,11 +1595,26 @@ NODEP_CPP_COMMI=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\version.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_VERSI=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\version.obj" : $(SOURCE) $(DEP_CPP_VERSI) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_VERSI=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -1308,11 +1646,27 @@ NODEP_CPP_VERSI=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\cvsrc.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_CVSRC=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	
+
+"$(INTDIR)\cvsrc.obj" : $(SOURCE) $(DEP_CPP_CVSRC) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_CVSRC=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -1345,11 +1699,26 @@ NODEP_CPP_CVSRC=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\remove.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_REMOV=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\remove.obj" : $(SOURCE) $(DEP_CPP_REMOV) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_REMOV=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -1381,11 +1750,32 @@ NODEP_CPP_REMOV=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\update.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_UPDAT=\
+	".\src\cvs.h"\
+	".\lib\savecwd.h"\
+	".\lib\md5.h"\
+	".\src\watch.h"\
+	".\src\fileattr.h"\
+	".\src\edit.h"\
+	".\lib\getline.h"\
+	
+
+"$(INTDIR)\update.obj" : $(SOURCE) $(DEP_CPP_UPDAT) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_UPDAT=\
 	".\src\cvs.h"\
 	".\lib\savecwd.h"\
@@ -1423,11 +1813,27 @@ NODEP_CPP_UPDAT=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\logmsg.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_LOGMS=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	
+
+"$(INTDIR)\logmsg.obj" : $(SOURCE) $(DEP_CPP_LOGMS) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_LOGMS=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -1460,11 +1866,26 @@ NODEP_CPP_LOGMS=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\classify.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_CLASS=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\classify.obj" : $(SOURCE) $(DEP_CPP_CLASS) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_CLASS=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -1496,11 +1917,27 @@ NODEP_CPP_CLASS=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\history.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_HISTO=\
+	".\src\cvs.h"\
+	".\lib\savecwd.h"\
+	
+
+"$(INTDIR)\history.obj" : $(SOURCE) $(DEP_CPP_HISTO) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_HISTO=\
 	".\src\cvs.h"\
 	".\lib\savecwd.h"\
@@ -1533,11 +1970,27 @@ NODEP_CPP_HISTO=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\add.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_ADD_C=\
+	".\src\cvs.h"\
+	".\lib\savecwd.h"\
+	
+
+"$(INTDIR)\add.obj" : $(SOURCE) $(DEP_CPP_ADD_C) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_ADD_C=\
 	".\src\cvs.h"\
 	".\lib\savecwd.h"\
@@ -1570,11 +2023,26 @@ NODEP_CPP_ADD_C=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\lock.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_LOCK_=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\lock.obj" : $(SOURCE) $(DEP_CPP_LOCK_) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_LOCK_=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -1606,11 +2074,29 @@ NODEP_CPP_LOCK_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\recurse.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_RECUR=\
+	".\src\cvs.h"\
+	".\lib\savecwd.h"\
+	".\src\fileattr.h"\
+	".\src\edit.h"\
+	
+
+"$(INTDIR)\recurse.obj" : $(SOURCE) $(DEP_CPP_RECUR) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_RECUR=\
 	".\src\cvs.h"\
 	".\lib\savecwd.h"\
@@ -1645,11 +2131,27 @@ NODEP_CPP_RECUR=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\modules.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_MODUL=\
+	".\src\cvs.h"\
+	".\lib\savecwd.h"\
+	
+
+"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_MODUL=\
 	".\src\cvs.h"\
 	".\lib\savecwd.h"\
@@ -1682,11 +2184,26 @@ NODEP_CPP_MODUL=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\find_names.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_FIND_=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\find_names.obj" : $(SOURCE) $(DEP_CPP_FIND_) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_FIND_=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -1718,11 +2235,26 @@ NODEP_CPP_FIND_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\rcs.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_RCS_C=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\rcs.obj" : $(SOURCE) $(DEP_CPP_RCS_C) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_RCS_C=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -1754,11 +2286,26 @@ NODEP_CPP_RCS_C=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\create_adm.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_CREAT=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\create_adm.obj" : $(SOURCE) $(DEP_CPP_CREAT) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_CREAT=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -1790,11 +2337,26 @@ NODEP_CPP_CREAT=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\main.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_MAIN_=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\main.obj" : $(SOURCE) $(DEP_CPP_MAIN_) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_MAIN_=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -1826,11 +2388,27 @@ NODEP_CPP_MAIN_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\patch.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_PATCH=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	
+
+"$(INTDIR)\patch.obj" : $(SOURCE) $(DEP_CPP_PATCH) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_PATCH=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -1863,11 +2441,27 @@ NODEP_CPP_PATCH=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\release.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_RELEA=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	
+
+"$(INTDIR)\release.obj" : $(SOURCE) $(DEP_CPP_RELEA) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_RELEA=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -1900,11 +2494,26 @@ NODEP_CPP_RELEA=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\rcscmds.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_RCSCM=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\rcscmds.obj" : $(SOURCE) $(DEP_CPP_RCSCM) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_RCSCM=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -1936,11 +2545,27 @@ NODEP_CPP_RCSCM=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\import.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_IMPOR=\
+	".\src\cvs.h"\
+	".\lib\savecwd.h"\
+	
+
+"$(INTDIR)\import.obj" : $(SOURCE) $(DEP_CPP_IMPOR) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_IMPOR=\
 	".\src\cvs.h"\
 	".\lib\savecwd.h"\
@@ -1973,11 +2598,27 @@ NODEP_CPP_IMPOR=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\ignore.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_IGNOR=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	
+
+"$(INTDIR)\ignore.obj" : $(SOURCE) $(DEP_CPP_IGNOR) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_IGNOR=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -2010,11 +2651,26 @@ NODEP_CPP_IGNOR=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\log.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_LOG_C=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\log.obj" : $(SOURCE) $(DEP_CPP_LOG_C) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_LOG_C=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -2046,11 +2702,27 @@ NODEP_CPP_LOG_C=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\wrapper.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_WRAPP=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	
+
+"$(INTDIR)\wrapper.obj" : $(SOURCE) $(DEP_CPP_WRAPP) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_WRAPP=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -2083,11 +2755,26 @@ NODEP_CPP_WRAPP=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\error.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_ERROR=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\error.obj" : $(SOURCE) $(DEP_CPP_ERROR) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_ERROR=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -2119,11 +2806,27 @@ NODEP_CPP_ERROR=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\expand_path.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_EXPAN=\
+	".\src\cvs.h"\
+	{$(INCLUDE)}"\sys\Types.h"\
+	
+
+"$(INTDIR)\expand_path.obj" : $(SOURCE) $(DEP_CPP_EXPAN) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_EXPAN=\
 	".\src\cvs.h"\
 	{$(INCLUDE)}"\sys\Types.h"\
@@ -2155,11 +2858,30 @@ NODEP_CPP_EXPAN=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\edit.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_EDIT_=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	".\src\watch.h"\
+	".\src\edit.h"\
+	".\src\fileattr.h"\
+	
+
+"$(INTDIR)\edit.obj" : $(SOURCE) $(DEP_CPP_EDIT_) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_EDIT_=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -2195,11 +2917,28 @@ NODEP_CPP_EDIT_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\fileattr.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_FILEA=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	".\src\fileattr.h"\
+	
+
+"$(INTDIR)\fileattr.obj" : $(SOURCE) $(DEP_CPP_FILEA) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_FILEA=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -2233,11 +2972,29 @@ NODEP_CPP_FILEA=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\watch.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_WATCH=\
+	".\src\cvs.h"\
+	".\src\edit.h"\
+	".\src\fileattr.h"\
+	".\src\watch.h"\
+	
+
+"$(INTDIR)\watch.obj" : $(SOURCE) $(DEP_CPP_WATCH) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_WATCH=\
 	".\src\cvs.h"\
 	".\src\edit.h"\
@@ -2272,11 +3029,27 @@ NODEP_CPP_WATCH=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\login.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_LOGIN=\
+	".\src\cvs.h"\
+	".\lib\getline.h"\
+	
+
+"$(INTDIR)\login.obj" : $(SOURCE) $(DEP_CPP_LOGIN) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_LOGIN=\
 	".\src\cvs.h"\
 	".\lib\getline.h"\
@@ -2309,11 +3082,26 @@ NODEP_CPP_LOGIN=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\scramble.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_SCRAM=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\scramble.obj" : $(SOURCE) $(DEP_CPP_SCRAM) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_SCRAM=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -2345,11 +3133,27 @@ NODEP_CPP_SCRAM=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\buffer.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_BUFFE=\
+	".\src\cvs.h"\
+	".\src\buffer.h"\
+	
+
+"$(INTDIR)\buffer.obj" : $(SOURCE) $(DEP_CPP_BUFFE) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_BUFFE=\
 	".\src\cvs.h"\
 	".\src\buffer.h"\
@@ -2382,11 +3186,29 @@ NODEP_CPP_BUFFE=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=.\src\zlib.c
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_ZLIB_=\
+	".\src\cvs.h"\
+	".\src\buffer.h"\
+	".\zlib\zlib.h"\
+	".\zlib\zconf.h"\
+	
+
+"$(INTDIR)\zlib.obj" : $(SOURCE) $(DEP_CPP_ZLIB_) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_ZLIB_=\
 	".\src\cvs.h"\
 	".\src\buffer.h"\
@@ -2421,6 +3243,8 @@ NODEP_CPP_ZLIB_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
@@ -2685,6 +3509,19 @@ DEP_CPP_VASPR=\
 # Begin Source File
 
 SOURCE=".\windows-NT\mkdir.c"
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_MKDIR=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\mkdir.obj" : $(SOURCE) $(DEP_CPP_MKDIR) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_MKDIR=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -2716,11 +3553,26 @@ NODEP_CPP_MKDIR=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=".\windows-NT\run.c"
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_RUN_C=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\run.obj" : $(SOURCE) $(DEP_CPP_RUN_C) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_RUN_C=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -2752,6 +3604,8 @@ NODEP_CPP_RUN_C=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
@@ -2770,6 +3624,19 @@ DEP_CPP_PWD_C=\
 # Begin Source File
 
 SOURCE=".\windows-NT\filesubr.c"
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_FILES=\
+	".\src\cvs.h"\
+	
+
+"$(INTDIR)\filesubr.obj" : $(SOURCE) $(DEP_CPP_FILES) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_FILES=\
 	".\src\cvs.h"\
 	".\windows-NT\config.h"\
@@ -2801,6 +3668,8 @@ NODEP_CPP_FILES=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
@@ -2857,6 +3726,20 @@ SOURCE=".\windows-NT\stripslash.c"
 # Begin Source File
 
 SOURCE=".\windows-NT\rcmd.c"
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_RCMD_=\
+	".\src\cvs.h"\
+	".\windows-NT\rcmd.h"\
+	
+
+"$(INTDIR)\rcmd.obj" : $(SOURCE) $(DEP_CPP_RCMD_) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_RCMD_=\
 	".\src\cvs.h"\
 	".\windows-NT\rcmd.h"\
@@ -2889,11 +3772,27 @@ NODEP_CPP_RCMD_=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
 
 SOURCE=".\windows-NT\startserver.c"
+
+!IF  "$(CFG)" == "cvsnt - Win32 Release"
+
+DEP_CPP_START=\
+	".\src\cvs.h"\
+	".\windows-NT\rcmd.h"\
+	
+
+"$(INTDIR)\startserver.obj" : $(SOURCE) $(DEP_CPP_START) "$(INTDIR)"
+   $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF  "$(CFG)" == "cvsnt - Win32 Debug"
+
 DEP_CPP_START=\
 	".\src\cvs.h"\
 	".\windows-NT\rcmd.h"\
@@ -2926,6 +3825,8 @@ NODEP_CPP_START=\
    $(CPP) $(CPP_PROJ) $(SOURCE)
 
 
+!ENDIF 
+
 # End Source File
 ################################################################################
 # Begin Source File
diff --git a/gnu/usr.bin/cvs/doc/ChangeLog b/gnu/usr.bin/cvs/doc/ChangeLog
index e956d4f791d..27314bed625 100644
--- a/gnu/usr.bin/cvs/doc/ChangeLog
+++ b/gnu/usr.bin/cvs/doc/ChangeLog
@@ -1,3 +1,45 @@
+Mon Mar 24 13:50:24 1997  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* cvs.texinfo (Creating a branch): Add comment about -r in branch
+	example.
+
+	* cvsclient.texi (Responses): Discuss meaning of tagspec and
+	future expansion in Set-sticky.  The behavior described is the one
+	which CVS has always implemented.
+
+Fri Mar 21 14:19:05 1997  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* cvsclient.texi (Requests): Revise meaning of "Case" per change
+	to CVS.
+
+Tue Mar 18 15:50:47 1997  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	The following reorganization hopefully presents numeric revisions
+	in a slightly more coherent fashion.  The only new material is the
+	paragraph about assigning revisions for added files.
+	* cvs.texinfo (A sample session): Bring in a sentence from Basic
+	concepts node, defining a repository.
+	(Revisions and branches): Renamed from Branches (it has always
+	covered non-branch tags too).  Bring in nodes "Revision numbers" and
+	"Versions revisions releases" from Basic concepts, the former in
+	particular was way too detailed for an intro section.
+	(A sample session): Add comment about how we need an introduction
+	and what might go into one.  Also bring in the paragraph from
+	Basic concepts introducing modules, but comment it out.
+	(Viewing differences): Add comment about 
+	(Basic concepts): Removed; its content has been farmed out as
+	described above, and as the comment said, it was fundamentally
+	flawed.
+	(Assigning revisions): New node.  Incorporates the "New major
+	release number" subsubsec which was in "commit examples".  Add
+	paragraph concerning how CVS assigns revisions on added files.
+	(commit options): Refer to that node under -r.
+	(Invoking CVS): Add comment about text for -r.
+
+Tue Mar 18 13:04:30 1997  Jim Meyering  <meyering@totoro.cyclic.com>
+
+	* Makefile.in: (install-info): Depend on installdirs.
+
 Sun Mar 16 12:37:12 1997  Jim Kingdon  <kingdon@harvey.cyclic.com>
 
 	* cvs.texinfo (File permissions): CVSUMASK now works for RCS
diff --git a/gnu/usr.bin/cvs/doc/cvsclient.texi b/gnu/usr.bin/cvs/doc/cvsclient.texi
index 6e3fbee9544..7feee6c6a90 100644
--- a/gnu/usr.bin/cvs/doc/cvsclient.texi
+++ b/gnu/usr.bin/cvs/doc/cvsclient.texi
@@ -432,12 +432,20 @@ recent @code{Directory} request.
 @c requests, but isn't documented and should be.
 
 @item Case \n
-Response expected: no.
-Tell the server that filenames should be matched against ignore patterns
-in a case-insensitive fashion.  Note that this does not apply to other
-comparisons---for example the filenames given in @code{Entry} and
-@code{Modified} requests for the same file must match in case regardless
-of whether the @code{Case} request is sent.
+Response expected: no.  Tell the server that filenames should be matched
+in a case-insensitive fashion.  Note that this is not the primary
+mechanism for achieving case-insensitivity; for the most part the client
+keeps track of the case which the server wants to use and takes care to
+always use that case regardless of what the user specifies.  For example
+the filenames given in @code{Entry} and @code{Modified} requests for the
+same file must match in case regardless of whether the @code{Case}
+request is sent.  The latter mechanism is more general (it could also be
+used for 8.3 filenames, VMS filenames with more than one @samp{.}, and
+any other situation in which there is a predictable mapping between
+filenames in the working directory and filenames in the protocol), but
+there are some situations it cannot handle (ignore patterns, or
+situations where the user specifies a filename and the client does not
+know about that file).
 
 @item Argument @var{text} \n
 Response expected: no.
@@ -731,8 +739,10 @@ Like @code{Set-static-directory}, but clear, not set, the flag.
 Additional data: @var{tagspec} \n.  Tell the client to set a sticky tag
 or date, which should be supplied with the @code{Sticky} request for
 future operations.  @var{pathname} ends in a slash; its purpose is to
-specify a directory, not a file within a directory.  The first character
-of @var{tagspec} is @samp{T} for a tag, or @samp{D} for a date.  The
+specify a directory, not a file within a directory.  The client should
+store @var{tagspec} and pass it back to the server as-is, to allow for
+future expansion.  The first character of @var{tagspec} is @samp{T} for
+a tag, @samp{D} for a date, or something else for future expansion.  The
 remainder of @var{tagspec} contains the actual tag or date.
 
 @item Clear-sticky @var{pathname} \n
diff --git a/gnu/usr.bin/cvs/src/ChangeLog b/gnu/usr.bin/cvs/src/ChangeLog
index a78216d0505..42a631ef2be 100644
--- a/gnu/usr.bin/cvs/src/ChangeLog
+++ b/gnu/usr.bin/cvs/src/ChangeLog
@@ -1,5 +1,60 @@
+Tue Mar 25 13:26:52 1997  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* version.c: Version 1.9.6.
+
+Mon Mar 24 13:02:04 1997  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* entries.c (ParseTag): Add comment about unrecognized characters
+	in CVS/Tag file.
+
+	* classify.c (Classify_File): Add comment about how specifying a
+	tag (bogusly?) suppresses certain messages.
+
+Fri Mar 21 13:37:46 1997  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* rcs.h (struct rcsnode): Add comment about case of PATH.
+	* rcs.c (RCS_parse): If ign_case, then try opening the file with
+	fopen_case.
+	* ignore.c (ign_case): Adjust comment.
+	* cvs.h, filesubr.c (cvs_casecmp, fopen_case): New functions.
+
+20 Mar 1997  Jim Kingdon
+
+	* client.c (send_repository): When sending Directory request,
+	send any ISDIRSEP character as '/'.  Fixes
+	"cvs log foo\bar\baz.c" on NT & friends.
+
+	* client.c (send_file_names): Don't try to read Entries file if
+	CVSADM directory does not exist.  Fixes fairly serious regression
+	(warning on all fresh checkouts) introduced by 1997-01-08 change.
+
+Tue Mar 18 13:03:33 1997  Jim Meyering  <meyering@totoro.cyclic.com>
+
+	* sanity.sh (RCSINIT): Define to be empty and export, to hide any
+	existing value that might cause spurious failures.
+
+	* Makefile.in: (install): Depend on installdirs.
+	Remove `CYGNUS LOCAL' comment saying not to.
+
+Tue Mar 18 09:36:26 1997  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* recurse.c (struct recursion_frame): Reindent.
+	(do_dir_proc): Print message if we try to recurse into a CVSADM
+	directory.
+	* sanity.sh (basicb): New test basicb-4a tests for above fix.
+
 Sun Mar 16 10:18:28 1997  Jim Kingdon  <kingdon@harvey.cyclic.com>
 
+	* sanity.sh (death2): Replace regexp matching temporary file name
+	with new variable ${tempname}.  For most of the tests this is a
+	cosmetic change, but death2-diff-6 had been missing _ which caused
+	it to fail on Solaris (at least sometimes).
+
+	* sanity.sh (modes): Don't use export -n; it doesn't seem
+	to be sufficiently portable.
+
+	* version.c: Change version number to 1.9.5.
+
 	* version.c: Version 1.9.4.
 
 	* rcscmds.c (RCS_checkin): Preserve the mode of the rcsfile.
diff --git a/gnu/usr.bin/cvs/src/classify.c b/gnu/usr.bin/cvs/src/classify.c
index 522017a472d..55851f7bb24 100644
--- a/gnu/usr.bin/cvs/src/classify.c
+++ b/gnu/usr.bin/cvs/src/classify.c
@@ -48,6 +48,11 @@ Classify_File (finfo, tag, date, options, force_tag_match, aflag, versp,
 	    if (vers->ts_user == NULL)
 	    {
 		/* there is no user file */
+		/* FIXME: Why do we skip this message if vers->tag or
+		   vers->date is set?  It causes "cvs update -r tag98 foo"
+		   to silently do nothing, which is seriously confusing
+		   behavior.  "cvs update foo" gives this message, which
+		   is what I would expect.  */
 		if (!force_tag_match || !(vers->tag || vers->date))
 		    if (!really_quiet)
 			error (0, 0, "nothing known about %s", finfo->fullname);
@@ -56,6 +61,11 @@ Classify_File (finfo, tag, date, options, force_tag_match, aflag, versp,
 	    else
 	    {
 		/* there is a user file */
+		/* FIXME: Why do we skip this message if vers->tag or
+		   vers->date is set?  It causes "cvs update -r tag98 foo"
+		   to silently do nothing, which is seriously confusing
+		   behavior.  "cvs update foo" gives this message, which
+		   is what I would expect.  */
 		if (!force_tag_match || !(vers->tag || vers->date))
 		    if (!really_quiet)
 			error (0, 0, "use `cvs add' to create an entry for %s",
diff --git a/gnu/usr.bin/cvs/src/rcs.h b/gnu/usr.bin/cvs/src/rcs.h
index ed6ea37f89f..1305b8c754c 100644
--- a/gnu/usr.bin/cvs/src/rcs.h
+++ b/gnu/usr.bin/cvs/src/rcs.h
@@ -47,7 +47,13 @@ struct rcsnode
 {
     int refcount;
     int flags;
+
+    /* File name of the RCS file.  This is not necessarily the name
+       as specified by the user, but it is a name which can be passed to
+       system calls and a name which is OK to print in error messages
+       (the various names might differ in case).  */
     char *path;
+
     char *head;
     char *branch;
     char *symbols_data;
diff --git a/gnu/usr.bin/cvs/src/sanity.sh b/gnu/usr.bin/cvs/src/sanity.sh
index 84e678c25bb..7906ec804c4 100644
--- a/gnu/usr.bin/cvs/src/sanity.sh
+++ b/gnu/usr.bin/cvs/src/sanity.sh
@@ -85,6 +85,10 @@ PROG=`basename ${testcvs}`
 # not allowed in usernames.  Other than that I'm not sure.
 username="[a-zA-Z0-9][a-zA-Z0-9]*"
 
+# Regexp to match the name of a temporary file (from cvs_temp_name).
+# This appears in certain diff output.
+tempname="[-a-zA-Z0-9/.%_]*"
+
 # FIXME: try things (what things? checkins?) without -m.
 #
 # Some of these tests are written to expect -Q.  But testing with
@@ -448,6 +452,11 @@ cd ${TESTDIR}
 mkdir home
 HOME=${TESTDIR}/home; export HOME
 
+# Make sure this variable is not defined to anything that would
+# change the format of rcs dates.  Otherwise people using e.g.,
+# RCSINIT=-zLT get lots of spurious failures.
+RCSINIT=; export RCSINIT
+
 # Remaining arguments are the names of tests to run.
 #
 # The testsuite is broken up into (hopefully manageably-sized)
@@ -730,6 +739,9 @@ File: sfile1           	Status: Locally Added
 	  dotest basicb-4 "${testcvs} add sfile2" \
 "${PROG} [a-z]*: scheduling file .sfile2. for addition
 ${PROG} [a-z]*: use .cvs commit. to add this file permanently"
+	  dotest basicb-4a "${testcvs} -q ci CVS" \
+"${PROG} [a-z]*: warning: directory CVS specified in argument
+${PROG} [a-z]*: but CVS uses CVS for its own purposes; skipping CVS directory"
 	  cd ..
 	  dotest basicb-5 "${testcvs} -q ci -m add" \
 'RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir1/sfile1,v
@@ -1947,7 +1959,7 @@ ${PROG} [a-z]*: use .${PROG} commit. to remove this file permanently"
 ===================================================================
 RCS file: file1
 diff -N file1
-\*\*\* [-a-zA-Z0-9/.%_]*[ 	][	]*[a-zA-Z0-9: ]*
+\*\*\* ${tempname}[ 	][	]*[a-zA-Z0-9: ]*
 --- /dev/null[ 	][ 	]*[a-zA-Z0-9: ]*
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
 \*\*\* 1 \*\*\*\*
@@ -1971,7 +1983,7 @@ done'
 ===================================================================
 RCS file: file1
 diff -N file1
-\*\*\* [-a-zA-Z0-9/.%_]*[ 	][	]*[a-zA-Z0-9: ]*
+\*\*\* ${tempname}[ 	][	]*[a-zA-Z0-9: ]*
 --- /dev/null[ 	][ 	]*[a-zA-Z0-9: ]*
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
 \*\*\* 1 \*\*\*\*
@@ -1986,7 +1998,7 @@ diff -N file1
 ===================================================================
 RCS file: file1
 diff -N file1
-\*\*\* [-a-zA-Z0-9/.%]*[ 	][	]*[a-zA-Z0-9: ]*
+\*\*\* ${tempname}[ 	][	]*[a-zA-Z0-9: ]*
 --- /dev/null[ 	][ 	]*[a-zA-Z0-9: ]*
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
 \*\*\* 1 \*\*\*\*
@@ -2023,7 +2035,7 @@ diff -c first-dir/file1:1\.1 first-dir/file1:removed
 RCS file: file1
 diff -N file1
 \*\*\* /dev/null[ 	][ 	]*[a-zA-Z0-9: ]*
---- [-a-zA-Z0-9/.%_]*[ 	][ 	]*[a-zA-Z0-9: ]*
+--- ${tempname}[ 	][ 	]*[a-zA-Z0-9: ]*
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
 \*\*\* 0 \*\*\*\*
 --- 1 ----
@@ -2095,7 +2107,7 @@ done'
 RCS file: file3
 diff -N file3
 \*\*\* /dev/null[ 	][ 	]*[a-zA-Z0-9: ]*
---- [-a-zA-Z0-9/.%_]*[ 	][ 	]*[a-zA-Z0-9: ]*
+--- ${tempname}[ 	][ 	]*[a-zA-Z0-9: ]*
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
 \*\*\* 0 \*\*\*\*
 --- 1 ----
@@ -2137,7 +2149,7 @@ Index: file2
 RCS file: file2
 diff -N file2
 \*\*\* /dev/null[ 	][ 	]*[a-zA-Z0-9: ]*
---- [-a-zA-Z0-9/.%_]*[ 	][ 	]*[a-zA-Z0-9: ]*
+--- ${tempname}[ 	][ 	]*[a-zA-Z0-9: ]*
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
 \*\*\* 0 \*\*\*\*
 --- 1 ----
@@ -2147,7 +2159,7 @@ Index: file3
 RCS file: file3
 diff -N file3
 \*\*\* /dev/null[ 	][ 	]*[a-zA-Z0-9: ]*
---- [-a-zA-Z0-9/.%_]*[ 	][ 	]*[a-zA-Z0-9: ]*
+--- ${tempname}[ 	][ 	]*[a-zA-Z0-9: ]*
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
 \*\*\* 0 \*\*\*\*
 --- 1 ----
@@ -2180,7 +2192,7 @@ ${PROG} [a-z]*: file3 is no longer in the repository"
 RCS file: file1
 diff -N file1
 \*\*\* /dev/null[ 	][ 	]*[a-zA-Z0-9: ]*
---- [-a-zA-Z0-9/.%_]*[ 	][ 	]*[a-zA-Z0-9: ]*
+--- ${tempname}[ 	][ 	]*[a-zA-Z0-9: ]*
 \*\*\*\*\*\*\*\*\*\*\*\*\*\*\*
 \*\*\* 0 \*\*\*\*
 --- 1 ----
@@ -5593,7 +5605,11 @@ done'
 	  # such as whether a second user can check out the files.  But
 	  # it would be awkward to test the consequences, so we don't.
 
-	  export -n CVSUMASK # if unset, defaults to 002
+	  # Solaris /bin/sh doesn't support export -n.  I'm not sure
+	  # what we can do about this, other than hope that whoever
+	  # is running the tests doesn't have CVSUMASK set.
+	  #export -n CVSUMASK # if unset, defaults to 002
+
 	  umask 077
 	  mkdir 1; cd 1
 	  dotest modes-1 "${testcvs} -q co -l ." ''
diff --git a/gnu/usr.bin/cvs/src/version.c b/gnu/usr.bin/cvs/src/version.c
index f09017c3174..8921e787a76 100644
--- a/gnu/usr.bin/cvs/src/version.c
+++ b/gnu/usr.bin/cvs/src/version.c
@@ -12,7 +12,7 @@
 
 #include "cvs.h"
 
-char *version_string = "\nConcurrent Versions System (CVS) 1.9.4";
+char *version_string = "\nConcurrent Versions System (CVS) 1.9.6";
 
 #ifdef CLIENT_SUPPORT
 #ifdef SERVER_SUPPORT
diff --git a/gnu/usr.bin/cvs/windows-NT/SCC/ChangeLog b/gnu/usr.bin/cvs/windows-NT/SCC/ChangeLog
index 5b3ca835f1e..d1f67a76fd1 100644
--- a/gnu/usr.bin/cvs/windows-NT/SCC/ChangeLog
+++ b/gnu/usr.bin/cvs/windows-NT/SCC/ChangeLog
@@ -1,3 +1,10 @@
+21 Mar 1997  Jim Kingdon
+
+	* scc.c (SccCheckout): Write to debuglog and return
+	-11 instead of -14.  I though maybe that this may be
+	related to the crashes I've been seeing, but those
+	crashes persisted when I deinstalled the SCC DLL.
+
 14 Mar 1997  Jim Kingdon
 
 	* scc.c: Go back to using debuglog not outproc for
diff --git a/gnu/usr.bin/cvs/windows-NT/SCC/scc.c b/gnu/usr.bin/cvs/windows-NT/SCC/scc.c
index 6815208f357..c8f10512b3a 100644
--- a/gnu/usr.bin/cvs/windows-NT/SCC/scc.c
+++ b/gnu/usr.bin/cvs/windows-NT/SCC/scc.c
@@ -14,6 +14,12 @@
 typedef long SCC_return;
 #define SCC_return_success 0
 #define SCC_return_unknown_project -2
+/* The file is not under SCC control.  */
+#define SCC_return_non_scc_file -11
+/* This operation is not supported.  I believe this status can only
+   be returned from SccGet, SccAdd, SccRemove, SccHistory, or
+   SccQueryInfo.  I'm not really sure what happens if it is returned
+   from other calls.  */
 #define SCC_return_not_supported -14
 #define SCC_return_non_specific_error -15
 enum SCC_command
@@ -257,7 +263,16 @@ SccCheckout (void *context_arg, HWND window, LONG num_files,
              LPSTR *file_names, LPSTR comment, LONG options,
              void *prov_options)
 {
-    return SCC_return_not_supported;
+    struct context *context = (struct context *)context_arg;
+    fprintf (context->debuglog, "SccCheckout num_files=%ld\n", num_files);
+    fflush (context->debuglog);
+    /* For the moment we say that all files are not ours.  I'm not sure
+       whether this is ever necessary; that is, whether the IDE will call
+       us except where we have told the IDE that a file is under source
+       control.  */
+    /* I'm not sure what we would do if num_files > 1 and we wanted to
+       return different statuses for different files.  */
+    return SCC_return_non_scc_file;
 }
 
 /* cvs ci.  */
diff --git a/gnu/usr.bin/cvs/zlib/ChangeLog b/gnu/usr.bin/cvs/zlib/ChangeLog
index 7ffad45dceb..02f090f5e49 100644
--- a/gnu/usr.bin/cvs/zlib/ChangeLog
+++ b/gnu/usr.bin/cvs/zlib/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 18 13:05:37 1997  Jim Meyering  <meyering@totoro.cyclic.com>
+
+	* Makefile.in (DISTFILES): Change glob pattern so that it doesn't
+	match `Makefile'.  Add Make_vms.com explicitly.
+
 1997-01-01  Fred Fish  <fnf@ninemoons.com>
 
 	* Makefile.in (CC): Use @CC@ rather than hard coded "cc".
diff --git a/gnu/usr.bin/cvs/zlib/Makefile.in b/gnu/usr.bin/cvs/zlib/Makefile.in
index 0296a9c4fec..93b60964d7f 100644
--- a/gnu/usr.bin/cvs/zlib/Makefile.in
+++ b/gnu/usr.bin/cvs/zlib/Makefile.in
@@ -43,8 +43,8 @@ OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
 TEST_OBJS = example.o minigzip.o
 
 # build_zlib.com added for CVS
-DISTFILES = README INDEX ChangeLog configure Make*[a-z0-9] descrip.mms \
-	    zlib.def zlib.rc algorithm.doc  *.[ch] \
+DISTFILES = README INDEX ChangeLog configure Makefile.*[a-z0-9] Make_vms.com \
+	    descrip.mms zlib.def zlib.rc algorithm.doc *.[ch] \
 	    build_zlib.com
 
 # For CVS, just build libz.a