Fix Windows build

Repair the Windows build.  Tested with the prepare-on-Unix method.
Some specific changes include:

* Removed the IPC finalizer (no longer used after r20787) from
  ccapi/lib/ccapi_ipc.c, as it was creating a difficult dependency
  chain for the pingtest build in ccapi/test.  Also updated pingtest
  to use the k5_ipc_stream interfaces since cci_stream is gone.

* Reverted the apparently non-functional r20277.

* klist -V prints just "Kerberos for Windows", since it has no access
  to PACKAGE_NAME and PACKAGE_VERSION from autoconf.  This should be
  addressed correctly.

* krb5, telnet, gssftp, and NIM are removed from the build.

* Some files had CRLFs; these were replaced with LFs and the
  svn:eol-style property set on the files.  Otherwise the CRLFs became
  CRCRLFs after the zip transfer.

* Windows does not have opendir/readdir, so added Windows code to
  prof_parse.c for includedir.  Probable fodder for a libkrb5support
  portability shim.

ticket: 6826
target_version: 1.9
tags: pullup

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

26 files changed, 221 insertions, 188 deletions

diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index a1d0eb747..12098d60c 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -1,6 +1,6 @@
 mydir=lib/crypto
 BUILDTOP=$(REL)..$(S)..
-SUBDIRS= krb @CRYPTO_IMPL@ crypto_tests
+SUBDIRS= krb $(CRYPTO_IMPL) crypto_tests
 
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
@@ -19,32 +19,32 @@ LIBFINIFUNC=cryptoint_cleanup_library
 RELDIR=crypto
 
 STOBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST				\
-	@CRYPTO_IMPL@/enc_provider/OBJS.ST				\
-	@CRYPTO_IMPL@/hash_provider/OBJS.ST				\
+	$(CRYPTO_IMPL)/enc_provider/OBJS.ST				\
+	$(CRYPTO_IMPL)/hash_provider/OBJS.ST				\
 	krb/checksum/OBJS.ST krb/prf/OBJS.ST krb/rand2key/OBJS.ST	\
 	krb/old/OBJS.ST krb/raw/OBJS.ST krb/prng/OBJS.ST		\
-	krb/prng/@PRNG_ALG@/OBJS.ST					\
-	@CRYPTO_IMPL@/md4/OBJS.ST @CRYPTO_IMPL@/md5/OBJS.ST		\
-	@CRYPTO_IMPL@/sha1/OBJS.ST					\
-	@CRYPTO_IMPL@/sha2/OBJS.ST					\
+	krb/prng/$(PRNG_ALG)/OBJS.ST					\
+	$(CRYPTO_IMPL)/md4/OBJS.ST $(CRYPTO_IMPL)/md5/OBJS.ST		\
+	$(CRYPTO_IMPL)/sha1/OBJS.ST					\
+	$(CRYPTO_IMPL)/sha2/OBJS.ST					\
 	krb/arcfour/OBJS.ST						\
-	@CRYPTO_IMPL@/aes/OBJS.ST @CRYPTO_IMPL@/des/OBJS.ST		\
-	@CRYPTO_IMPL@/camellia/OBJS.ST krb/OBJS.ST			\
-	@CRYPTO_IMPL@/OBJS.ST
+	$(CRYPTO_IMPL)/aes/OBJS.ST $(CRYPTO_IMPL)/des/OBJS.ST		\
+	$(CRYPTO_IMPL)/camellia/OBJS.ST krb/OBJS.ST			\
+	$(CRYPTO_IMPL)/OBJS.ST
 
 SUBDIROBJLISTS=krb/crc32/OBJS.ST krb/dk/OBJS.ST				\
-	@CRYPTO_IMPL@/enc_provider/OBJS.ST				\
-	@CRYPTO_IMPL@/hash_provider/OBJS.ST				\
+	$(CRYPTO_IMPL)/enc_provider/OBJS.ST				\
+	$(CRYPTO_IMPL)/hash_provider/OBJS.ST				\
 	krb/checksum/OBJS.ST krb/prf/OBJS.ST krb/rand2key/OBJS.ST	\
 	krb/old/OBJS.ST krb/raw/OBJS.ST krb/prng/OBJS.ST		\
-	krb/prng/@PRNG_ALG@/OBJS.ST					\
-	@CRYPTO_IMPL@/md4/OBJS.ST @CRYPTO_IMPL@/md5/OBJS.ST		\
-	@CRYPTO_IMPL@/sha1/OBJS.ST					\
-	@CRYPTO_IMPL@/sha2/OBJS.ST					\
+	krb/prng/$(PRNG_ALG)/OBJS.ST					\
+	$(CRYPTO_IMPL)/md4/OBJS.ST $(CRYPTO_IMPL)/md5/OBJS.ST		\
+	$(CRYPTO_IMPL)/sha1/OBJS.ST					\
+	$(CRYPTO_IMPL)/sha2/OBJS.ST					\
 	krb/arcfour/OBJS.ST						\
-	@CRYPTO_IMPL@/aes/OBJS.ST @CRYPTO_IMPL@/des/OBJS.ST		\
-	@CRYPTO_IMPL@/camellia/OBJS.ST krb/OBJS.ST			\
-	@CRYPTO_IMPL@/OBJS.ST
+	$(CRYPTO_IMPL)/aes/OBJS.ST $(CRYPTO_IMPL)/des/OBJS.ST		\
+	$(CRYPTO_IMPL)/camellia/OBJS.ST krb/OBJS.ST			\
+	$(CRYPTO_IMPL)/OBJS.ST
 
 # No dependencies.  Record places to find this shared object if the target
 # link editor and loader support it.
@@ -58,7 +58,9 @@ SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
 SHLIB_RDIRS=$(KRB5_LIBDIR)
 
-##DOS##LIBOBJS = $(OBJS)
+##DOS##LIBNAME=$(OUTPRE)crypto.lib
+##DOS##OBJFILEDEP=$(OUTPRE)crc32.lst $(OUTPRE)rand2key.lst $(OUTPRE)yarrow.lst $(OUTPRE)prng.lst $(OUTPRE)prf.lst $(OUTPRE)checksum.lst $(OUTPRE)krb.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)arcfour.lst $(OUTPRE)dk.lst $(OUTPRE)aes.lst $(OUTPRE)enc_provider.lst $(OUTPRE)des.lst $(OUTPRE)md5.lst $(OUTPRE)camellia.lst $(OUTPRE)md4.lst $(OUTPRE)hash_provider.lst $(OUTPRE)sha2.lst $(OUTPRE)sha1.lst $(OUTPRE)builtin.lst
+##DOS##OBJFILELIST=@$(OUTPRE)crc32.lst @$(OUTPRE)rand2key.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)prng.lst @$(OUTPRE)prf.lst @$(OUTPRE)checksum.lst @$(OUTPRE)krb.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)dk.lst @$(OUTPRE)aes.lst @$(OUTPRE)enc_provider.lst @$(OUTPRE)des.lst @$(OUTPRE)md5.lst @$(OUTPRE)camellia.lst @$(OUTPRE)md4.lst @$(OUTPRE)hash_provider.lst @$(OUTPRE)sha2.lst @$(OUTPRE)sha1.lst @$(OUTPRE)builtin.lst
 
 all-unix:: all-liblinks
 install-unix:: install-libs
@@ -76,8 +78,8 @@ all-windows::
 	cd krb
 	@echo Making in crypto\krb
 	$(MAKE) -$(MFLAGS)
-	cd ..\@CRYPTO_IMPL@
-	@echo Making in crypto\@CRYPTO_IMPL@
+	cd ..\$(CRYPTO_IMPL)
+	@echo Making in crypto\$(CRYPTO_IMPL)
 	$(MAKE) -$(MFLAGS)
 	cd ..\crypto_tests
 	@echo Making in crypto\crypto_tests
@@ -88,8 +90,8 @@ clean-windows::
 	cd krb
 	@echo Making in clean crypto\krb
 	$(MAKE) -$(MFLAGS) clean
-	cd ..\@CRYPTO_IMPL@
-	@echo Making clean in crypto\@CRYPTO_IMPL@
+	cd ..\$(CRYPTO_IMPL)
+	@echo Making clean in crypto\$(CRYPTO_IMPL)
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\crypto_tests
 	@echo Making clean in crypto\crypto_tests
diff --git a/src/lib/crypto/builtin/Makefile.in b/src/lib/crypto/builtin/Makefile.in
index 240d2895b..603c57cd0 100644
--- a/src/lib/crypto/builtin/Makefile.in
+++ b/src/lib/crypto/builtin/Makefile.in
@@ -20,11 +20,9 @@ DEFS=
 EXTRADEPSRCS= $(srcdir)/t_cf2.c 
 
 
-##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=$(OUTPRE)crypto.lib
-##DOSOBJFILE=$(OUTPRE)crypto.lst
-##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst $(OUTPRE)camellia.lst
-##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst $(OUTPRE)camellia.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR = builtin
+##DOS##OBJFILE = ..\$(OUTPRE)builtin.lst
 
 STLIBOBJS=\
 	hmac.o	\
@@ -78,91 +76,97 @@ clean::
 
 
 all-windows::
-	cd ..\des
-	@echo Making in crypto\des
+	cd des
+	@echo Making in crypto\builtin\des
 	$(MAKE) -$(MFLAGS)
 	cd ..\md4
-	@echo Making in crypto\md4
+	@echo Making in crypto\builtin\md4
 	$(MAKE) -$(MFLAGS)
 	cd ..\md5
-	@echo Making in crypto\md5
+	@echo Making in crypto\builtin\md5
 	$(MAKE) -$(MFLAGS)
 	cd ..\sha1
-	@echo Making in crypto\sha1
+	@echo Making in crypto\builtin\sha1
 	$(MAKE) -$(MFLAGS)
-	cd ..\sh2a
-	@echo Making in crypto\sha2
+	cd ..\sha2
+	@echo Making in crypto\builtin\sha2
 	$(MAKE) -$(MFLAGS)
 	cd ..\hash_provider
-	@echo Making in crypto\hash_provider
+	@echo Making in crypto\builtin\hash_provider
 	$(MAKE) -$(MFLAGS)
 	cd ..\enc_provider
-	@echo Making in crypto\enc_provider
+	@echo Making in crypto\builtin\enc_provider
 	$(MAKE) -$(MFLAGS)
 	cd ..\aes
-	@echo Making in crypto\aes
+	@echo Making in crypto\builtin\aes
 	$(MAKE) -$(MFLAGS)
 	cd ..\camellia
-	@echo Making in crypto\camellia
+	@echo Making in crypto\builtin\camellia
 	$(MAKE) -$(MFLAGS)
 	cd ..
+	@echo Making in crypto\builtin
 
 clean-windows::
-	cd ..\des
-	@echo Making clean in crypto\des
+	cd des
+	@echo Making clean in crypto\builtin\des
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\md4
-	@echo Making clean in crypto\md4
+	@echo Making clean in crypto\builtin\md4
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\md5
-	@echo Making clean in crypto\md5
+	@echo Making clean in crypto\builtin\md5
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\sha1
-	@echo Making clean in crypto\sha1
+	@echo Making clean in crypto\builtin\sha1
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\sha2
-	@echo Making clean in crypto\sha2
+	@echo Making clean in crypto\builtin\sha2
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\hash_provider
-	@echo Making clean in crypto\hash_provider
+	@echo Making clean in crypto\builtin\hash_provider
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\enc_provider
-	@echo Making clean in crypto\enc_provider
+	@echo Making clean in crypto\builtin\enc_provider
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\aes
-	@echo Making clean in crypto\aes
+	@echo Making clean in crypto\builtin\aes
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\camellia
-	@echo Making clean in crypto\camellia
+	@echo Making clean in crypto\builtin\camellia
 	$(MAKE) -$(MFLAGS) clean
 	cd ..
+	@echo Making clean in crypto\builtin
 
 check-windows::
-	cd ..\des
-	@echo Making check in crypto\des
+	cd des
+	@echo Making check in crypto\builtin\des
 	$(MAKE) -$(MFLAGS) check
 	cd ..\md4
-	@echo Making check in crypto\md4
+	@echo Making check in crypto\builtin\md4
 	$(MAKE) -$(MFLAGS) check
 	cd ..\md5
-	@echo Making check in crypto\md5
+	@echo Making check in crypto\builtin\md5
 	$(MAKE) -$(MFLAGS) check
 	cd ..\sha1
-	@echo Making check in crypto\sha1
+	@echo Making check in crypto\builtin\sha1
+	$(MAKE) -$(MFLAGS) check
+	cd ..\sha2
+	@echo Making check in crypto\builtin\sha2
 	$(MAKE) -$(MFLAGS) check
 	cd ..\hash_provider
-	@echo Making check in crypto\hash_provider
+	@echo Making check in crypto\builtin\hash_provider
 	$(MAKE) -$(MFLAGS) check
 	cd ..\enc_provider
-	@echo Making check in crypto\enc_provider
+	@echo Making check in crypto\builtin\enc_provider
 	$(MAKE) -$(MFLAGS) check
 	cd ..\aes
-	@echo Making check in crypto\aes
+	@echo Making check in crypto\builtin\aes
 	$(MAKE) -$(MFLAGS) check
 	cd ..\camellia
-	@echo Making check in crypto\camellia
+	@echo Making check in crypto\builtin\camellia
 	$(MAKE) -$(MFLAGS) check
 	cd ..
+	@echo Making check in crypto\builtin
 
 
 @lib_frag@
diff --git a/src/lib/crypto/builtin/aes/Makefile.in b/src/lib/crypto/builtin/aes/Makefile.in
index 260cc97cc..64f73a379 100644
--- a/src/lib/crypto/builtin/aes/Makefile.in
+++ b/src/lib/crypto/builtin/aes/Makefile.in
@@ -4,8 +4,8 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../..
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=aes
-##DOS##OBJFILE=..\$(OUTPRE)aes.lst
+##DOS##PREFIXDIR = builtin\aes
+##DOS##OBJFILE = ..\..\$(OUTPRE)aes.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/builtin/camellia/Makefile.in b/src/lib/crypto/builtin/camellia/Makefile.in
index d848defd8..2ad3e73f6 100644
--- a/src/lib/crypto/builtin/camellia/Makefile.in
+++ b/src/lib/crypto/builtin/camellia/Makefile.in
@@ -7,8 +7,8 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk \
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=camellia
-##DOS##OBJFILE=..\$(OUTPRE)camellia.lst
+##DOS##PREFIXDIR = builtin\camellia
+##DOS##OBJFILE = ..\..\$(OUTPRE)camellia.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/builtin/des/Makefile.in b/src/lib/crypto/builtin/des/Makefile.in
index 325fdc262..5001d48bf 100644
--- a/src/lib/crypto/builtin/des/Makefile.in
+++ b/src/lib/crypto/builtin/des/Makefile.in
@@ -4,8 +4,8 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=des
-##DOS##OBJFILE=..\$(OUTPRE)des.lst
+##DOS##PREFIXDIR = builtin\des
+##DOS##OBJFILE = ..\..\$(OUTPRE)des.lst
 
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/crypto/builtin/enc_provider/Makefile.in b/src/lib/crypto/builtin/enc_provider/Makefile.in
index aadec6e6a..80bfc60bd 100644
--- a/src/lib/crypto/builtin/enc_provider/Makefile.in
+++ b/src/lib/crypto/builtin/enc_provider/Makefile.in
@@ -10,8 +10,8 @@ LOCALINCLUDES = -I$(srcdir)/../des 	\
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=enc_provider
-##DOS##OBJFILE=..\$(OUTPRE)enc_prov.lst
+##DOS##PREFIXDIR = builtin\enc_provider
+##DOS##OBJFILE = ..\..\$(OUTPRE)enc_provider.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/builtin/enc_provider/camellia.c b/src/lib/crypto/builtin/enc_provider/camellia.c
index 566f2d78f..337a3104d 100644
--- a/src/lib/crypto/builtin/enc_provider/camellia.c
+++ b/src/lib/crypto/builtin/enc_provider/camellia.c
@@ -358,9 +358,11 @@ krb5int_camellia_cbc_mac(krb5_key key, const krb5_crypto_iov *data,
 }
 
 const struct krb5_enc_provider krb5int_enc_camellia128 = {
+    0
 };
 
 const struct krb5_enc_provider krb5int_enc_camellia256 = {
+    0
 };
 
 #endif /* CAMELLIA */
diff --git a/src/lib/crypto/builtin/hash_provider/Makefile.in b/src/lib/crypto/builtin/hash_provider/Makefile.in
index 36ec412c5..e91901ee5 100644
--- a/src/lib/crypto/builtin/hash_provider/Makefile.in
+++ b/src/lib/crypto/builtin/hash_provider/Makefile.in
@@ -5,8 +5,8 @@ LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=hash_provider
-##DOS##OBJFILE=..\$(OUTPRE)hash_pro.lst
+##DOS##PREFIXDIR = builtin\hash_provider
+##DOS##OBJFILE = ..\..\$(OUTPRE)hash_provider.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/builtin/md4/Makefile.in b/src/lib/crypto/builtin/md4/Makefile.in
index 561927a1e..00ec64315 100644
--- a/src/lib/crypto/builtin/md4/Makefile.in
+++ b/src/lib/crypto/builtin/md4/Makefile.in
@@ -4,8 +4,8 @@ LOCALINCLUDES = -I$(srcdir)
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=md4
-##DOS##OBJFILE=..\$(OUTPRE)md4.lst
+##DOS##PREFIXDIR = builtin\md4
+##DOS##OBJFILE = ..\..\$(OUTPRE)md4.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/builtin/md5/Makefile.in b/src/lib/crypto/builtin/md5/Makefile.in
index 6a1f52fa6..840bb62b9 100644
--- a/src/lib/crypto/builtin/md5/Makefile.in
+++ b/src/lib/crypto/builtin/md5/Makefile.in
@@ -3,8 +3,8 @@ BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=md5
-##DOS##OBJFILE=..\$(OUTPRE)md5.lst
+##DOS##PREFIXDIR = builtin\md5
+##DOS##OBJFILE = ..\..\$(OUTPRE)md5.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/builtin/sha1/Makefile.in b/src/lib/crypto/builtin/sha1/Makefile.in
index ec51713a1..719f63370 100644
--- a/src/lib/crypto/builtin/sha1/Makefile.in
+++ b/src/lib/crypto/builtin/sha1/Makefile.in
@@ -3,8 +3,8 @@ BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=sha1
-##DOS##OBJFILE=..\$(OUTPRE)sha1.lst
+##DOS##PREFIXDIR = builtin\sha1
+##DOS##OBJFILE = ..\..\$(OUTPRE)sha1.lst
 
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/crypto/builtin/sha2/Makefile.in b/src/lib/crypto/builtin/sha2/Makefile.in
index 535d7eeb8..3b854ec29 100644
--- a/src/lib/crypto/builtin/sha2/Makefile.in
+++ b/src/lib/crypto/builtin/sha2/Makefile.in
@@ -3,8 +3,8 @@ BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=sha2
-##DOS##OBJFILE=..\$(OUTPRE)sha2.lst
+##DOS##PREFIXDIR = builtin\sha2
+##DOS##OBJFILE = ..\..\$(OUTPRE)sha2.lst
 
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/crypto/crypto_tests/Makefile.in b/src/lib/crypto/crypto_tests/Makefile.in
index 06b1745e9..17e1683d6 100644
--- a/src/lib/crypto/crypto_tests/Makefile.in
+++ b/src/lib/crypto/crypto_tests/Makefile.in
@@ -1,15 +1,16 @@
 mydir=lib/crypto/crypto_tests
 BUILDTOP=$(REL)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)/../@CRYPTO_IMPL@/enc_provider 		\
-	-I$(srcdir)/../@CRYPTO_IMPL@/hash_provider -I$(srcdir)/../krb/keyhash_provider 	\
-	-I$(srcdir)/../krb/dk -I$(srcdir)/../@CRYPTO_IMPL@/ 			\
-	-I$(srcdir)/../krb/prng 	\
-	-I$(srcdir)/../krb/prng/@PRNG_ALG@ 	\
-	-I$(srcdir)/../krb/crc32 -I$(srcdir)/../krb/old -I$(srcdir)/../krb/raw 	\
-	-I$(srcdir)/../@CRYPTO_IMPL@/aes -I$(srcdir)/../@CRYPTO_IMPL@/des 	\
-	-I$(srcdir)/../@CRYPTO_IMPL@/arcfour -I$(srcdir)/../@CRYPTO_IMPL@/sha1 	\
-	-I$(srcdir)/../@CRYPTO_IMPL@/md5 -I$(srcdir)/../@CRYPTO_IMPL@/md4 \
-	-I$(srcdir)/../@CRYPTO_IMPL@/camellia
+LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)/../$(CRYPTO_IMPL)/enc_provider \
+	-I$(srcdir)/../$(CRYPTO_IMPL)/hash_provider \
+	-I$(srcdir)/../krb/keyhash_provider -I$(srcdir)/../krb/dk \
+	-I$(srcdir)/../$(CRYPTO_IMPL) -I$(srcdir)/../krb/prng \
+	-I$(srcdir)/../krb/prng/$(PRNG_ALG) -I$(srcdir)/../krb/crc32 \
+	-I$(srcdir)/../krb/old -I$(srcdir)/../krb/raw \
+	-I$(srcdir)/../$(CRYPTO_IMPL)/aes -I$(srcdir)/../$(CRYPTO_IMPL)/des \
+	-I$(srcdir)/../$(CRYPTO_IMPL)/arcfour \
+	-I$(srcdir)/../$(CRYPTO_IMPL)/sha1 \
+	-I$(srcdir)/../$(CRYPTO_IMPL)/md5 -I$(srcdir)/../$(CRYPTO_IMPL)/md4 \
+	-I$(srcdir)/../$(CRYPTO_IMPL)/camellia
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
@@ -39,13 +40,7 @@ EXTRADEPSRCS=\
 	$(srcdir)/t_fork.c	\
 	$(srcdir)/ytest.c	
 
-##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=$(OUTPRE)crypto.lib
-##DOSOBJFILE=$(OUTPRE)crypto.lst
-##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst
-##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)arcfour.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst $(OUTPRE)aes.lst
-
-##DOS##LIBOBJS = $(OBJS)
+##DOS##BUILDTOP = ..\..\..
 
 # NOTE: The t_cksum known checksum values are primarily for regression
 # testing.  They are not derived a priori, but are known to produce
@@ -63,7 +58,7 @@ check-unix:: t_nfold t_encrypt t_decrypt t_prf t_prng t_cmac t_hmac \
 	$(RUN_SETUP) $(VALGRIND) ./t_encrypt
 	$(RUN_SETUP) $(VALGRIND) ./t_decrypt
 	$(RUN_SETUP) $(VALGRIND) ./t_prng <$(srcdir)/t_prng.seed >t_prng.output
-	if [ @PRNG_ALG@ = yarrow ]; then \
+	if [ $(PRNG_ALG) = yarrow ]; then \
 		diff t_prng.output $(srcdir)/t_prng.expected; \
 	fi
 	$(RUN_SETUP) $(VALGRIND) ./t_cmac
diff --git a/src/lib/crypto/krb/Makefile.in b/src/lib/crypto/krb/Makefile.in
index 94b06c4ee..7536bf80b 100644
--- a/src/lib/crypto/krb/Makefile.in
+++ b/src/lib/crypto/krb/Makefile.in
@@ -2,25 +2,25 @@ mydir=lib/crypto/krb
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS= arcfour checksum crc32 dk \
 	prf rand2key old raw prng 
-LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../@CRYPTO_IMPL@/enc_provider -I$(srcdir)/dk	\
-		-I$(srcdir)/../@CRYPTO_IMPL@/hash_provider				\
-		-I$(srcdir)/prf -I$(srcdir)/rand2key		 			\
+LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../$(CRYPTO_IMPL)/enc_provider \
+		-I$(srcdir)/dk -I$(srcdir)/../$(CRYPTO_IMPL)/hash_provider \
+		-I$(srcdir)/prf -I$(srcdir)/rand2key \
 		-I$(srcdir)/old -I$(srcdir)/raw \
-		-I$(srcdir)/prng 		\
-		-I$(srcdir)/prng/@PRNG_ALG@ 		\
-		-I$(srcdir)/../@CRYPTO_IMPL@/ -I$(srcdir)/../@CRYPTO_IMPL@/des		\
-		-I$(srcdir)/../@CRYPTO_IMPL@/aes -I$(srcdir)/arcfour 	\
-		-I$(srcdir)/../@CRYPTO_IMPL@/camellia \
-		-I$(srcdir)/../@CRYPTO_IMPL@/sha1 -I$(srcdir)/../@CRYPTO_IMPL@
+		-I$(srcdir)/prng \
+		-I$(srcdir)/prng/$(PRNG_ALG) \
+		-I$(srcdir)/../$(CRYPTO_IMPL) \
+		-I$(srcdir)/../$(CRYPTO_IMPL)/des \
+		-I$(srcdir)/../$(CRYPTO_IMPL)/aes -I$(srcdir)/arcfour 	\
+		-I$(srcdir)/../$(CRYPTO_IMPL)/camellia \
+		-I$(srcdir)/../$(CRYPTO_IMPL)/sha1 \
+		-I$(srcdir)/../$(CRYPTO_IMPL)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 DEFS=
 
-##DOSBUILDTOP = ..\..\..
-##DOSLIBNAME=$(OUTPRE)crypto.lib
-##DOSOBJFILE=$(OUTPRE)crypto.lst
-##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)cksum.lst @$(OUTPRE)yarrow.lst @$(OUTPRE)aes.lst
-##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)arcfour.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)cksum.lst $(OUTPRE)aes.lst
+##DOS##BUILDTOP = ..\..\..
+##DOS##PREFIXDIR = krb
+##DOS##OBJFILE = ..\$(OUTPRE)krb.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
@@ -67,7 +67,7 @@ STLIBOBJS=\
 OBJS=\
 	$(OUTPRE)aead.$(OBJEXT)		 	\
 	$(OUTPRE)block_size.$(OBJEXT)		\
-	$(OUTPRE)cf2$(OBJEXT) 			\
+	$(OUTPRE)cf2.$(OBJEXT) 			\
 	$(OUTPRE)checksum_length.$(OBJEXT)	\
 	$(OUTPRE)cksumtype_to_string.$(OBJEXT)	\
 	$(OUTPRE)cksumtypes.$(OBJEXT)		\
@@ -83,7 +83,7 @@ OBJS=\
 	$(OUTPRE)encrypt_length.$(OBJEXT)	\
 	$(OUTPRE)enctype_util.$(OBJEXT)	\
 	$(OUTPRE)etypes.$(OBJEXT)		\
-	$(OUTPRE)key.$(OBJECT)			\
+	$(OUTPRE)key.$(OBJEXT)			\
 	$(OUTPRE)keyblocks.$(OBJEXT) 		\
 	$(OUTPRE)keyed_cksum.$(OBJEXT)		\
 	$(OUTPRE)keyed_checksum_types.$(OBJEXT)	\
@@ -98,6 +98,7 @@ OBJS=\
 	$(OUTPRE)random_to_key.$(OBJEXT)	\
 	$(OUTPRE)state.$(OBJEXT) 		\
 	$(OUTPRE)string_to_cksumtype.$(OBJEXT)	\
+	$(OUTPRE)string_to_key.$(OBJEXT)	\
 	$(OUTPRE)valid_cksumtype.$(OBJEXT)	\
 	$(OUTPRE)verify_checksum.$(OBJEXT)	\
 	$(OUTPRE)verify_checksum_iov.$(OBJEXT)
@@ -143,11 +144,11 @@ SRCS=\
 
 STOBJLISTS=arcfour/OBJS.ST checksum/OBJS.ST crc32/OBJS.ST	\
 	dk/OBJS.ST prf/OBJS.ST rand2key/OBJS.ST			\
-	old/OBJS.ST raw/OBJS.ST  prng/@PRNG_ALG@/OBJS.ST prng/OBJS.ST OBJS.ST
+	old/OBJS.ST raw/OBJS.ST  prng/$(PRNG_ALG)/OBJS.ST prng/OBJS.ST OBJS.ST
 
 SUBDIROBJLISTS=arcfour/OBJS.ST checksum/OBJS.ST crc32/OBJS.ST	\
 	dk/OBJS.ST prf/OBJS.ST rand2key/OBJS.ST			\
-	old/OBJS.ST raw/OBJS.ST  prng/@PRNG_ALG@/OBJS.ST prng/OBJS.ST  
+	old/OBJS.ST raw/OBJS.ST  prng/$(PRNG_ALG)/OBJS.ST prng/OBJS.ST  
 
 ##DOS##LIBOBJS = $(OBJS)
 
@@ -160,93 +161,96 @@ clean-unix:: clean-libobjs
 
 all-windows::
 	cd arcfour
-	@echo Making in crypto\arcfour
+	@echo Making in crypto\krb\arcfour
 	$(MAKE) -$(MFLAGS)
 	cd ..\crc32
-	@echo Making in crypto\crc32
+	@echo Making in crypto\krb\crc32
 	$(MAKE) -$(MFLAGS)
 	cd ..\checksum
-	@echo Making in crypto\checksum
+	@echo Making in crypto\krb\checksum
 	$(MAKE) -$(MFLAGS)
 	cd ..\dk
-	@echo Making in crypto\dk
+	@echo Making in crypto\krb\dk
 	$(MAKE) -$(MFLAGS)
 	cd ..\prf
-	@echo Making in crypto\prf
+	@echo Making in crypto\krb\prf
 	$(MAKE) -$(MFLAGS)
 	cd ..\rand2key
-	@echo Making in crypto\rand2key
+	@echo Making in crypto\krb\rand2key
 	$(MAKE) -$(MFLAGS)
 	cd ..\old
-	@echo Making in crypto\old
+	@echo Making in crypto\krb\old
 	$(MAKE) -$(MFLAGS)
 	cd ..\raw
-	@echo Making in crypto\raw
+	@echo Making in crypto\krb\raw
 	$(MAKE) -$(MFLAGS)
 	cd ..\prng
-	@echo Making in crypto\prng
+	@echo Making in crypto\krb\prng
 	$(MAKE) -$(MFLAGS)
 	cd ..
+	@echo Making in crypto\krb
 
 clean-windows::
 	cd arcfour
-	@echo Making in clean crypto\arcfour
+	@echo Making in clean crypto\krb\arcfour
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\crc32
-	@echo Making in clean crypto\crc32
+	@echo Making in clean crypto\krb\crc32
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\checksum
-	@echo Making clean in crypto\checksum
+	@echo Making clean in crypto\krb\checksum
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\dk
-	@echo Making clean in crypto\dk
+	@echo Making clean in crypto\krb\dk
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\prf
-	@echo Making clean in crypto\prf
+	@echo Making clean in crypto\krb\prf
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\rand2key
-	@echo Making clean in crypto\rand2key
+	@echo Making clean in crypto\krb\rand2key
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\old
-	@echo Making clean in crypto\old
+	@echo Making clean in crypto\krb\old
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\raw
-	@echo Making clean in crypto\raw
+	@echo Making clean in crypto\krb\raw
 	$(MAKE) -$(MFLAGS) clean
 	cd ..\prng
-	@echo Making clean in crypto\prng
+	@echo Making clean in crypto\krb\prng
 	$(MAKE) -$(MFLAGS) clean
 	cd ..
+	@echo Making clean in crypto\krb
 
 check-windows::
 	cd arcfour
-	@echo Making in check crypto\arcfour
+	@echo Making in check crypto\krb\arcfour
 	$(MAKE) -$(MFLAGS) check
 	cd ..\crc32
-	@echo Making in check crypto\crc32
+	@echo Making in check crypto\krb\crc32
 	$(MAKE) -$(MFLAGS) check
 	cd ..\checksum
-	@echo Making check in crypto\checksum
+	@echo Making check in crypto\krb\checksum
 	$(MAKE) -$(MFLAGS) check
 	cd ..\dk
-	@echo Making check in crypto\dk
+	@echo Making check in crypto\krb\dk
 	$(MAKE) -$(MFLAGS) check
 	cd ..\prf
-	@echo Making check in crypto\prf
+	@echo Making check in crypto\krb\prf
 	$(MAKE) -$(MFLAGS) check
 	cd ..\rand2key
-	@echo Making check in crypto\rand2key
+	@echo Making check in crypto\krb\rand2key
 	$(MAKE) -$(MFLAGS) check
 	cd ..\old
-	@echo Making check in crypto\old
+	@echo Making check in crypto\krb\old
 	$(MAKE) -$(MFLAGS) check
 	cd ..\raw
-	@echo Making check in crypto\raw
+	@echo Making check in crypto\krb\raw
 	$(MAKE) -$(MFLAGS) check
 	cd ..\prng
-	@echo Making check in crypto\prng
+	@echo Making check in crypto\krb\prng
 	$(MAKE) -$(MFLAGS) check
 	cd ..
+	@echo Making check in crypto\krb
 
 
 @lib_frag@
diff --git a/src/lib/crypto/krb/arcfour/Makefile.in b/src/lib/crypto/krb/arcfour/Makefile.in
index bd234faff..f3f0a9bb0 100644
--- a/src/lib/crypto/krb/arcfour/Makefile.in
+++ b/src/lib/crypto/krb/arcfour/Makefile.in
@@ -1,12 +1,12 @@
 mydir=lib/crypto/krb/arcfour
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@ \
-	-I$(srcdir)/../../@CRYPTO_IMPL@/md4
+LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL) \
+	-I$(srcdir)/../../$(CRYPTO_IMPL)/md4
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=arcfour
-##DOS##OBJFILE=..\$(OUTPRE)arcfour.lst
+##DOS##PREFIXDIR = krb\arcfour
+##DOS##OBJFILE = ..\..\$(OUTPRE)arcfour.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/krb/checksum/Makefile.in b/src/lib/crypto/krb/checksum/Makefile.in
index 826afd189..65a8cbcf4 100644
--- a/src/lib/crypto/krb/checksum/Makefile.in
+++ b/src/lib/crypto/krb/checksum/Makefile.in
@@ -4,15 +4,15 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../arcfour
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=checksum
-##DOS##OBJFILE=..\$(OUTPRE)cksum.lst
+##DOS##PREFIXDIR = krb\checksum
+##DOS##OBJFILE = ..\..\$(OUTPRE)checksum.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
 STLIBOBJS= cbc.o cmac.o confounder.o hmac_md5.o unkeyed.o
 
-OBJS=	$(OUTPRE)cbc.$(OBJEXT) $(OUTPRE)cmac.$(OBJECT) \
+OBJS=	$(OUTPRE)cbc.$(OBJEXT) $(OUTPRE)cmac.$(OBJEXT) \
 	$(OUTPRE)confounder.$(OBJEXT) $(OUTPRE)hmac_md5.$(OBJEXT) \
 	$(OUTPRE)unkeyed.$(OBJEXT)
 
diff --git a/src/lib/crypto/krb/crc32/Makefile.in b/src/lib/crypto/krb/crc32/Makefile.in
index b34f3aa72..d46c73962 100644
--- a/src/lib/crypto/krb/crc32/Makefile.in
+++ b/src/lib/crypto/krb/crc32/Makefile.in
@@ -3,8 +3,8 @@ BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=crc32
-##DOS##OBJFILE=..\$(OUTPRE)crc32.lst
+##DOS##PREFIXDIR = krb\crc32
+##DOS##OBJFILE = ..\..\$(OUTPRE)crc32.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/krb/dk/Makefile.in b/src/lib/crypto/krb/dk/Makefile.in
index cd804bc6d..0a710110c 100644
--- a/src/lib/crypto/krb/dk/Makefile.in
+++ b/src/lib/crypto/krb/dk/Makefile.in
@@ -1,11 +1,11 @@
 mydir=lib/crypto/krb/dk
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/..  -I$(srcdir)/../../@CRYPTO_IMPL@
+LOCALINCLUDES = -I$(srcdir)/..  -I$(srcdir)/../../$(CRYPTO_IMPL)
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=dk
-##DOS##OBJFILE=..\$(OUTPRE)dk.lst
+##DOS##PREFIXDIR = krb\dk
+##DOS##OBJFILE = ..\..\$(OUTPRE)dk.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/krb/old/Makefile.in b/src/lib/crypto/krb/old/Makefile.in
index cc3c7f602..0f21070cf 100644
--- a/src/lib/crypto/krb/old/Makefile.in
+++ b/src/lib/crypto/krb/old/Makefile.in
@@ -1,11 +1,11 @@
 mydir=lib/crypto/krb/old
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/../../@CRYPTO_IMPL@/des -I$(srcdir)/.. -I$(srcdir)
+LOCALINCLUDES = -I$(srcdir)/../../$(CRYPTO_IMPL)/des -I$(srcdir)/.. -I$(srcdir)
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..
-##DOS##PREFIXDIR=old
-##DOS##OBJFILE=..\$(OUTPRE)old.lst
+##DOS##BUILDTOP = ..\..\..\..
+##DOS##PREFIXDIR = krb\old
+##DOS##OBJFILE = ..\..\$(OUTPRE)old.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/krb/prf/Makefile.in b/src/lib/crypto/krb/prf/Makefile.in
index a0e1ad6b1..c2f412d8e 100644
--- a/src/lib/crypto/krb/prf/Makefile.in
+++ b/src/lib/crypto/krb/prf/Makefile.in
@@ -2,14 +2,14 @@ mydir=lib/crypto/krb/prf
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/.. 		\
 		-I$(srcdir)/../dk			\
-		-I$(srcdir)/../../@CRYPTO_IMPL@ 	\
-		-I$(srcdir)/../../@CRYPTO_IMPL@/md5 	\
-		-I$(srcdir)/../../@CRYPTO_IMPL@/sha1 
+		-I$(srcdir)/../../$(CRYPTO_IMPL) 	\
+		-I$(srcdir)/../../$(CRYPTO_IMPL)/md5 	\
+		-I$(srcdir)/../../$(CRYPTO_IMPL)/sha1 
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=prf
-##DOS##OBJFILE=..\$(OUTPRE)prf.lst
+##DOS##PREFIXDIR = krb\prf
+##DOS##OBJFILE = ..\..\$(OUTPRE)prf.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/krb/prng/Makefile.in b/src/lib/crypto/krb/prng/Makefile.in
index 76a9388b8..cef3710cf 100644
--- a/src/lib/crypto/krb/prng/Makefile.in
+++ b/src/lib/crypto/krb/prng/Makefile.in
@@ -1,16 +1,19 @@
 mydir=lib/crypto/krb/prng
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-SUBDIRS= @PRNG_ALG@
-LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../../@CRYPTO_IMPL@/enc_provider \
-		-I$(srcdir)/../../@CRYPTO_IMPL@/hash_provider				\
-		-I$(srcdir)/@PRNG_ALG@ 			\
-		-I$(srcdir)/../../@CRYPTO_IMPL@/ 		\
-		-I$(srcdir)/../../@CRYPTO_IMPL@/aes 	\
-		-I$(srcdir)/../../@CRYPTO_IMPL@/sha1 -I$(srcdir)/../../@CRYPTO_IMPL@/sha2
+SUBDIRS= $(PRNG_ALG)
+LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../../$(CRYPTO_IMPL)/enc_provider \
+		-I$(srcdir)/../../$(CRYPTO_IMPL)/hash_provider				\
+		-I$(srcdir)/$(PRNG_ALG) 			\
+		-I$(srcdir)/../../$(CRYPTO_IMPL)/ 		\
+		-I$(srcdir)/../../$(CRYPTO_IMPL)/aes 	\
+		-I$(srcdir)/../../$(CRYPTO_IMPL)/sha1 -I$(srcdir)/../../$(CRYPTO_IMPL)/sha2
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 DEFS=
 
+##DOS##BUILDTOP = ..\..\..\..
+##DOS##PREFIXDIR = krb\prng
+##DOS##OBJFILE = ..\..\$(OUTPRE)prng.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
@@ -24,9 +27,11 @@ OBJS=\
 SRCS=\
 	$(srcdir)/prng.c
 
-STOBJLISTS= OBJS.ST  @PRNG_ALG@/OBJS.ST 
+##DOS##LIBOBJS = $(OBJS)
 
-SUBDIROBJLISTS=  @PRNG_ALG@/OBJS.ST 
+STOBJLISTS= OBJS.ST  $(PRNG_ALG)/OBJS.ST 
+
+SUBDIROBJLISTS=  $(PRNG_ALG)/OBJS.ST 
 
 
 all-unix:: all-libobjs
@@ -36,6 +41,27 @@ depend:: $(SRCS)
 
 clean-unix:: clean-libobjs
 
+all-windows::
+	cd yarrow
+	@echo Making in crypto\krb\prng\yarrow
+	$(MAKE) -$(MFLAGS)
+	cd ..
+	@echo Making in crypto\krb\prng
+
+clean-windows::
+	cd yarrow
+	@echo Making clean in crypto\krb\prng\yarrow
+	$(MAKE) -$(MFLAGS) clean
+	cd ..
+	@echo Making clean in crypto\krb\prng
+
+check-windows::
+	cd yarrow
+	@echo Making check in crypto\krb\prng\yarrow
+	$(MAKE) -$(MFLAGS) check
+	cd ..
+	@echo Making check in crypto\krb\prng
+
 @lib_frag@
 @libobj_frag@
 
diff --git a/src/lib/crypto/krb/prng/fortuna/Makefile.in b/src/lib/crypto/krb/prng/fortuna/Makefile.in
index fd66e08c3..367eb0174 100644
--- a/src/lib/crypto/krb/prng/fortuna/Makefile.in
+++ b/src/lib/crypto/krb/prng/fortuna/Makefile.in
@@ -1,10 +1,10 @@
 mydir=lib/crypto/krb/prng/fortuna
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \
-		-I$(srcdir)/../../../@CRYPTO_IMPL@		\
-		-I$(srcdir)/../../../@CRYPTO_IMPL@/sha2 	\
-		-I$(srcdir)/../../../@CRYPTO_IMPL@/aes 	\
-		-I$(srcdir)/../../../@CRYPTO_IMPL@/enc_provider
+		-I$(srcdir)/../../../$(CRYPTO_IMPL)		\
+		-I$(srcdir)/../../../$(CRYPTO_IMPL)/sha2 	\
+		-I$(srcdir)/../../../$(CRYPTO_IMPL)/aes 	\
+		-I$(srcdir)/../../../$(CRYPTO_IMPL)/enc_provider
 DEFS=
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/crypto/krb/prng/nss/Makefile.in b/src/lib/crypto/krb/prng/nss/Makefile.in
index 04fbd1957..d6d29b932 100644
--- a/src/lib/crypto/krb/prng/nss/Makefile.in
+++ b/src/lib/crypto/krb/prng/nss/Makefile.in
@@ -2,7 +2,7 @@ mydir=lib/crypto/krb/prng/nss
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \
-		-I$(srcdir)/../../../@CRYPTO_IMPL@ $(CRYPTO_IMPL_CFLAGS)
+		-I$(srcdir)/../../../$(CRYPTO_IMPL) $(CRYPTO_IMPL_CFLAGS)
 DEFS=
 
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/crypto/krb/prng/yarrow/Makefile.in b/src/lib/crypto/krb/prng/yarrow/Makefile.in
index 40dd85aa0..93d6bc44c 100644
--- a/src/lib/crypto/krb/prng/yarrow/Makefile.in
+++ b/src/lib/crypto/krb/prng/yarrow/Makefile.in
@@ -1,14 +1,14 @@
 mydir=lib/crypto/krb/prng/yarrow
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \
-		-I$(srcdir)/../../../@CRYPTO_IMPL@		\
-		-I$(srcdir)/../../../@CRYPTO_IMPL@/sha1 	\
-		-I$(srcdir)/../../../@CRYPTO_IMPL@/enc_provider
+		-I$(srcdir)/../../../$(CRYPTO_IMPL)		\
+		-I$(srcdir)/../../../$(CRYPTO_IMPL)/sha1 	\
+		-I$(srcdir)/../../../$(CRYPTO_IMPL)/enc_provider
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=yarrow
-##DOS##OBJFILE=..\$(OUTPRE)yarrow.lst
+##DOS##BUILDTOP = ..\..\..\..\..
+##DOS##PREFIXDIR = krb\prng\yarrow
+##DOS##OBJFILE = ..\..\..\$(OUTPRE)yarrow.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/krb/rand2key/Makefile.in b/src/lib/crypto/krb/rand2key/Makefile.in
index adde89b94..f6975d7d9 100644
--- a/src/lib/crypto/krb/rand2key/Makefile.in
+++ b/src/lib/crypto/krb/rand2key/Makefile.in
@@ -1,11 +1,11 @@
 mydir=lib/crypto/krb/rand2key
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/. -I$(srcdir)/../../@CRYPTO_IMPL@/des
+LOCALINCLUDES = -I$(srcdir)/. -I$(srcdir)/../../$(CRYPTO_IMPL)/des
 DEFS=
 
 ##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=rand2key
-##DOS##OBJFILE=..\$(OUTPRE)rand2key.lst
+##DOS##PREFIXDIR = krb\rand2key
+##DOS##OBJFILE= ..\..\$(OUTPRE)rand2key.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/crypto/krb/raw/Makefile.in b/src/lib/crypto/krb/raw/Makefile.in
index 147b1d52e..a9c3b09d8 100644
--- a/src/lib/crypto/krb/raw/Makefile.in
+++ b/src/lib/crypto/krb/raw/Makefile.in
@@ -1,11 +1,11 @@
 mydir=lib/crypto/krb/raw
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
-LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../@CRYPTO_IMPL@
+LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL)
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..
-##DOS##PREFIXDIR=raw
-##DOS##OBJFILE=..\$(OUTPRE)raw.lst
+##DOS##BUILDTOP = ..\..\..\..
+##DOS##PREFIXDIR = krb\raw
+##DOS##OBJFILE = ..\..\$(OUTPRE)raw.lst
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)