Compile clients/{kinit,klist,kdestroy} on Win32

Several minor Windows fixes (mostly cosmetic)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9841 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 62 insertions, 47 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 21ba0bae3..b41f979ef 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -30,6 +30,9 @@ all-windows:: makefile-windows
 	@echo Making in windows
 	cd ..\windows
 	-$(MAKE) -$(MAKEFLAGS) 
+	@echo Making in clients
+	cd ..\clients
+	-$(MAKE) -$(MAKEFLAGS)
 	cd ..
 
 world::
@@ -120,6 +123,8 @@ config-windows:: makefile-windows
 ##DOS##	config\windows.in config\win-post.in
 
 ##DOS##makefile-windows:: $(MKFDEP) makefile \
+##DOS##		clients\makefile clients\kdestroy\makefile \
+##DOS##		clients\kinit\makefile clients\klist\makefile \
 ##DOS##		include\makefile include\krb5\makefile \
 ##DOS##		lib\makefile lib\crypto\makefile \
 ##DOS##		lib\crypto\crc32\makefile lib\crypto\des\makefile \
@@ -145,83 +150,91 @@ config-windows:: makefile-windows
 ##DOS##	config\rm.bat wconfig.obj msvc.pdb
 
 ##DOS##makefile: makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <makefile.in >makefile
+##DOS##	.\wconfig config < $@.in > $@
+##DOS##clients\makefile: clients\makefile.in $(MKFDEP)
+##DOS##	.\wconfig config < $@.in > $@
+##DOS##clients\kdestroy\makefile: clients\kdestroy\makefile.in $(MKFDEP)
+##DOS##	.\wconfig config < $@.in > $@
+##DOS##clients\kinit\makefile: clients\kinit\makefile.in $(MKFDEP)
+##DOS##	.\wconfig config < $@.in > $@
+##DOS##clients\klist\makefile: clients\klist\makefile.in $(MKFDEP)
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##include\makefile: include\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <include\makefile.in >include\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##include\krb5\makefile: include\krb5\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <include\krb5\makefile.in >include\krb5\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\makefile: lib\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\makefile.in >lib\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\crypto\makefile: lib\crypto\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\crypto\makefile.in >lib\crypto\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\crypto\crc32\makefile: lib\crypto\crc32\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\crypto\crc32\makefile.in >lib\crypto\crc32\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\crypto\des\makefile: lib\crypto\des\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\crypto\des\makefile.in >lib\crypto\des\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\crypto\sha\makefile: lib\crypto\sha\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\crypto\sha\makefile.in >lib\crypto\sha\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\crypto\md4\makefile: lib\crypto\md4\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\crypto\md4\makefile.in >lib\crypto\md4\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\crypto\md5\makefile: lib\crypto\md5\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\crypto\md5\makefile.in >lib\crypto\md5\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\crypto\os\makefile: lib\crypto\os\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\crypto\os\makefile.in >lib\crypto\os\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\des425\makefile: lib\des425\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\des425\makefile.in >lib\des425\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\gssapi\makefile: lib\gssapi\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\gssapi\makefile.in >lib\gssapi\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\gssapi\generic\makefile: lib\gssapi\generic\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\gssapi\generic\makefile.in >lib\gssapi\generic\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\gssapi\mechglue\makefile: lib\gssapi\mechglue\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\gssapi\mechglue\makefile.in >lib\gssapi\mechglue\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\gssapi\krb5\makefile: lib\gssapi\krb5\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\gssapi\krb5\makefile.in >lib\gssapi\krb5\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\kadm\makefile: lib\kadm\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\kadm\makefile.in >lib\kadm\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\krb4\makefile: lib\krb4\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\krb4\makefile.in >lib\krb4\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\krb5\makefile: lib\krb5\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\krb5\makefile.in >lib\krb5\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\krb5\asn.1\makefile: lib\krb5\asn.1\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\krb5\asn.1\makefile.in >lib\krb5\asn.1\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\krb5\ccache\makefile: lib\krb5\ccache\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\krb5\ccache\makefile.in >lib\krb5\ccache\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\krb5\ccache\file\makefile: lib\krb5\ccache\file\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\krb5\ccache\file\makefile.in >lib\krb5\ccache\file\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\krb5\ccache\stdio\makefile: lib\krb5\ccache\stdio\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\krb5\ccache\stdio\makefile.in >lib\krb5\ccache\stdio\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\krb5\error_tables\makefile: lib\krb5\error_tables\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\krb5\error_tables\makefile.in >lib\krb5\error_tables\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\krb5\free\makefile: lib\krb5\free\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\krb5\free\makefile.in >lib\krb5\free\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\krb5\keytab\makefile: lib\krb5\keytab\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\krb5\keytab\makefile.in >lib\krb5\keytab\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\krb5\keytab\file\makefile: lib\krb5\keytab\file\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\krb5\keytab\file\makefile.in >lib\krb5\keytab\file\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\krb5\krb\makefile: lib\krb5\krb\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\krb5\krb\makefile.in >lib\krb5\krb\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\krb5\os\makefile: lib\krb5\os\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\krb5\os\makefile.in >lib\krb5\os\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\krb5\posix\makefile: lib\krb5\posix\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\krb5\posix\makefile.in >lib\krb5\posix\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##lib\krb5\rcache\makefile: lib\krb5\rcache\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <lib\krb5\rcache\makefile.in >lib\krb5\rcache\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##util\et\makefile: util\et\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <util\et\makefile.in >util\et\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##util\profile\makefile: util\profile\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <util\profile\makefile.in >util\profile\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##util\windows\makefile: util\windows\makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <util\windows\makefile.in >util\windows\makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##windows\Makefile:  windows\Makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <windows\Makefile.in >windows\Makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##windows\cns\Makefile:  windows\cns\Makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <windows\cns\Makefile.in >windows\cns\Makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##windows\gina\Makefile:  windows\gina\Makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <windows\gina\Makefile.in >windows\gina\Makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##windows\gss\Makefile:  windows\gss\Makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <windows\gss\Makefile.in >windows\gss\Makefile
+##DOS##	.\wconfig config < $@.in > $@
 ##DOS##windows\wintel\Makefile:  windows\wintel\Makefile.in $(MKFDEP)
-##DOS##	.\wconfig config <windows\wintel\Makefile.in >windows\wintel\Makefile
+##DOS##	.\wconfig config < $@.in > $@
 
 ##DOS##wconfig.exe: wconfig.c
 ##DOS##	SET CL=/nologo
@@ -259,20 +272,22 @@ ren2long:
 #
 ZIP=zip
 FILES= ./* \
+	clients/* clients/kdestroy/* clients/kinit/* clients/klist/* \
 	config/* include/* include/krb5/* include/krb5/asn.1/* \
-	include/krb5/stock/* include/sys/* lib/* lib/crypto/* \
-	lib/crypto/crc32/* lib/crypto/des/* lib/crypto/sha/* lib/crypto/md4/* \
-	lib/crypto/md5/* lib/crypto/os/* lib/des425/* lib/gssapi/* \
-	lib/gssapi/generic/* lib/gssapi/krb5/* lib/gssapi/mechglue/* \
-	lib/kadm/* lib/krb4/* lib/krb425/* \
+	include/krb5/stock/* include/sys/* lib/* \
+	lib/crypto/* lib/crypto/crc32/* lib/crypto/des/* \
+	lib/crypto/sha/* lib/crypto/md4/* lib/crypto/md5/* lib/crypto/os/* \
+	lib/des425/* lib/gssapi/* lib/gssapi/generic/* lib/gssapi/krb5/* \
+	lib/gssapi/mechglue/* lib/kadm/* lib/krb4/* \
 	lib/krb5/* lib/krb5/asn.1/* lib/krb5/krb/* \
 	lib/krb5/ccache/* lib/krb5/ccache/file/* \
 	lib/krb5/ccache/stdio/* lib/krb5/error_tables/* \
 	lib/krb5/free/* lib/krb5/keytab/* lib/krb5/keytab/file/* \
-	lib/krb5/os/* lib/krb5/posix/* lib/krb5/rcache/* util/et/* \
-	util/profile/* util/windows/*
+	lib/krb5/os/* lib/krb5/posix/* lib/krb5/rcache/* \
+	util/et/* util/profile/*
 
-WINFILES= windows/* windows/cns/* windows/wintel/* windows/gss/* windows/gina/*
+WINFILES= util/windows/* \
+	windows/* windows/cns/* windows/wintel/* windows/gss/* windows/gina/*
 
 MACFILES= mac/* mac/kconfig/* mac/libraries/* mac/telnet-k5-auth/* \
 	mac/gss-sample/* mac/SAP/* config/* include/* include/krb5/* \