From 505ae39e1f5ef32013b0e95ff487de28663680cf Mon Sep 17 00:00:00 2001
From: Greg Hudson <ghudson@mit.edu>
Date: Sun, 28 Nov 2010 01:36:42 +0000
Subject: [PATCH] Use for loops for recursion in the Windows build, cutting
 down on the verbiage in Makefile.in files.  For correctness of output, every
 Makefile.in mydir= definition is changed to use $(S) instead of /.

ticket: 6826

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24536 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/Makefile.in                               |  46 +-------
 src/appl/Makefile.in                          |  13 +--
 src/appl/gss-sample/Makefile.in               |   2 +-
 src/appl/sample/Makefile.in                   |   2 +-
 src/appl/sample/sclient/Makefile.in           |   2 +-
 src/appl/sample/sserver/Makefile.in           |   2 +-
 src/appl/simple/Makefile.in                   |   2 +-
 src/appl/simple/client/Makefile.in            |   2 +-
 src/appl/simple/server/Makefile.in            |   2 +-
 src/appl/user_user/Makefile.in                |   2 +-
 src/ccapi/Makefile.in                         |  30 +-----
 src/ccapi/common/Makefile.in                  |   2 +-
 src/ccapi/common/unix/Makefile.in             |   2 +-
 src/ccapi/lib/Makefile.in                     |   2 +-
 src/ccapi/lib/unix/Makefile.in                |   2 +-
 src/ccapi/server/Makefile.in                  |   2 +-
 src/ccapi/server/unix/Makefile.in             |   2 +-
 src/ccapi/server/win/Makefile.in              |   2 +-
 src/clients/Makefile.in                       |  48 +--------
 src/clients/kdestroy/Makefile.in              |   2 +-
 src/clients/kinit/Makefile.in                 |   2 +-
 src/clients/klist/Makefile.in                 |   2 +-
 src/clients/kpasswd/Makefile.in               |   2 +-
 src/clients/ksu/Makefile.in                   |   2 +-
 src/clients/kvno/Makefile.in                  |   2 +-
 src/config/win-post.in                        |  44 +++++---
 src/include/Makefile.in                       |   5 +-
 src/kadmin/cli/Makefile.in                    |   2 +-
 src/kadmin/dbutil/Makefile.in                 |   2 +-
 src/kadmin/ktutil/Makefile.in                 |   2 +-
 src/kadmin/server/Makefile.in                 |   2 +-
 src/kadmin/testing/Makefile.in                |   2 +-
 src/kadmin/testing/scripts/Makefile.in        |   2 +-
 src/kadmin/testing/util/Makefile.in           |   2 +-
 src/lib/Makefile.in                           |  29 +----
 src/lib/apputils/Makefile.in                  |   2 +-
 src/lib/crypto/Makefile.in                    |  26 +----
 src/lib/crypto/builtin/Makefile.in            |  99 +----------------
 src/lib/crypto/builtin/aes/Makefile.in        |   2 +-
 src/lib/crypto/builtin/camellia/Makefile.in   |   2 +-
 src/lib/crypto/builtin/des/Makefile.in        |   2 +-
 .../crypto/builtin/enc_provider/Makefile.in   |   2 +-
 .../crypto/builtin/hash_provider/Makefile.in  |   2 +-
 src/lib/crypto/builtin/md4/Makefile.in        |   2 +-
 src/lib/crypto/builtin/md5/Makefile.in        |   2 +-
 src/lib/crypto/builtin/sha1/Makefile.in       |   2 +-
 src/lib/crypto/builtin/sha2/Makefile.in       |   2 +-
 src/lib/crypto/crypto_tests/Makefile.in       |   2 +-
 src/lib/crypto/krb/Makefile.in                |  99 +----------------
 src/lib/crypto/krb/arcfour/Makefile.in        |   2 +-
 src/lib/crypto/krb/checksum/Makefile.in       |   2 +-
 src/lib/crypto/krb/crc32/Makefile.in          |   2 +-
 src/lib/crypto/krb/dk/Makefile.in             |   2 +-
 src/lib/crypto/krb/old/Makefile.in            |   2 +-
 src/lib/crypto/krb/prf/Makefile.in            |   2 +-
 src/lib/crypto/krb/prng/Makefile.in           |  23 +---
 src/lib/crypto/krb/prng/fortuna/Makefile.in   |   2 +-
 src/lib/crypto/krb/prng/nss/Makefile.in       |   2 +-
 src/lib/crypto/krb/prng/yarrow/Makefile.in    |   2 +-
 src/lib/crypto/krb/rand2key/Makefile.in       |   2 +-
 src/lib/crypto/krb/raw/Makefile.in            |   2 +-
 src/lib/crypto/nss/Makefile.in                | 101 +-----------------
 src/lib/crypto/nss/aes/Makefile.in            |  13 +--
 src/lib/crypto/nss/camellia/Makefile.in       |  13 +--
 src/lib/crypto/nss/des/Makefile.in            |  14 +--
 src/lib/crypto/nss/enc_provider/Makefile.in   |   8 +-
 src/lib/crypto/nss/hash_provider/Makefile.in  |   8 +-
 src/lib/crypto/nss/md4/Makefile.in            |  15 +--
 src/lib/crypto/nss/md5/Makefile.in            |  14 +--
 src/lib/crypto/nss/sha1/Makefile.in           |  10 +-
 src/lib/crypto/nss/sha2/Makefile.in           |  10 +-
 src/lib/crypto/openssl/Makefile.in            |  89 +--------------
 src/lib/crypto/openssl/aes/Makefile.in        |  14 +--
 src/lib/crypto/openssl/camellia/Makefile.in   |  13 +--
 src/lib/crypto/openssl/des/Makefile.in        |  14 +--
 .../crypto/openssl/enc_provider/Makefile.in   |   9 +-
 .../crypto/openssl/hash_provider/Makefile.in  |   8 +-
 src/lib/crypto/openssl/md4/Makefile.in        |  15 +--
 src/lib/crypto/openssl/md5/Makefile.in        |  14 +--
 src/lib/crypto/openssl/sha1/Makefile.in       |  10 +-
 src/lib/crypto/openssl/sha2/Makefile.in       |  10 +-
 src/lib/gssapi/Makefile.in                    |  33 +-----
 src/lib/gssapi/generic/Makefile.in            |   2 +-
 src/lib/gssapi/krb5/Makefile.in               |   5 +-
 src/lib/gssapi/mechglue/Makefile.in           |   2 +-
 src/lib/gssapi/spnego/Makefile.in             |   2 +-
 src/lib/kadm5/Makefile.in                     |   2 +-
 src/lib/kadm5/clnt/Makefile.in                |   2 +-
 src/lib/kadm5/srv/Makefile.in                 |   2 +-
 src/lib/kadm5/unit-test/Makefile.in           |   2 +-
 src/lib/kdb/Makefile.in                       |   2 +-
 src/lib/krb5/Makefile.in                      |  64 +----------
 src/lib/krb5/asn.1/Makefile.in                |   2 +-
 src/lib/krb5/ccache/Makefile.in               |   2 +-
 src/lib/krb5/ccache/ccapi/Makefile.in         |   2 +-
 src/lib/krb5/error_tables/Makefile.in         |   2 +-
 src/lib/krb5/keytab/Makefile.in               |   2 +-
 src/lib/krb5/krb/Makefile.in                  |   2 +-
 src/lib/krb5/os/Makefile.in                   |   2 +-
 src/lib/krb5/rcache/Makefile.in               |   2 +-
 src/lib/krb5/unicode/Makefile.in              |   2 +-
 src/lib/rpc/Makefile.in                       |   2 +-
 src/lib/rpc/unit-test/Makefile.in             |   2 +-
 src/plugins/authdata/greet/Makefile.in        |   2 +-
 src/plugins/authdata/greet_client/Makefile.in |   2 +-
 src/plugins/authdata/greet_server/Makefile.in |   2 +-
 src/plugins/kadm5_hook/test/Makefile.in       |   2 +-
 src/plugins/kdb/db2/Makefile.in               |   2 +-
 src/plugins/kdb/db2/libdb2/Makefile.in        |   2 +-
 src/plugins/kdb/db2/libdb2/btree/Makefile.in  |   2 +-
 src/plugins/kdb/db2/libdb2/db/Makefile.in     |   2 +-
 src/plugins/kdb/db2/libdb2/hash/Makefile.in   |   2 +-
 src/plugins/kdb/db2/libdb2/mpool/Makefile.in  |   2 +-
 src/plugins/kdb/db2/libdb2/recno/Makefile.in  |   2 +-
 src/plugins/kdb/db2/libdb2/test/Makefile.in   |   2 +-
 src/plugins/kdb/hdb/Makefile.in               |   2 +-
 src/plugins/kdb/ldap/Makefile.in              |   2 +-
 src/plugins/kdb/ldap/ldap_util/Makefile.in    |   2 +-
 src/plugins/kdb/ldap/libkdb_ldap/Makefile.in  |   2 +-
 src/plugins/locate/python/Makefile.in         |   2 +-
 src/plugins/preauth/cksum_body/Makefile.in    |   2 +-
 .../preauth/encrypted_challenge/Makefile.in   |   2 +-
 src/plugins/preauth/pkinit/Makefile.in        |   2 +-
 src/plugins/preauth/securid_sam2/Makefile.in  |   2 +-
 src/plugins/preauth/wpse/Makefile.in          |   2 +-
 src/tests/asn.1/Makefile.in                   |   2 +-
 src/tests/create/Makefile.in                  |   2 +-
 src/tests/dejagnu/Makefile.in                 |   2 +-
 src/tests/gss-threads/Makefile.in             |   2 +-
 src/tests/gssapi/Makefile.in                  |   2 +-
 src/tests/hammer/Makefile.in                  |   2 +-
 src/tests/misc/Makefile.in                    |   2 +-
 src/tests/mkeystash_compat/Makefile.in        |   2 +-
 src/tests/resolve/Makefile.in                 |   2 +-
 src/tests/shlib/Makefile.in                   |   2 +-
 src/tests/threads/Makefile.in                 |   2 +-
 src/tests/verify/Makefile.in                  |   2 +-
 src/util/Makefile.in                          |  34 +-----
 src/util/collected-client-lib/Makefile.in     |   2 +-
 src/util/et/Makefile.in                       |   2 +-
 src/util/profile/Makefile.in                  |   2 +-
 src/util/send-pr/Makefile.in                  |   2 +-
 src/util/ss/Makefile.in                       |   2 +-
 src/util/support/Makefile.in                  |   2 +-
 src/windows/Makefile.in                       |  53 +--------
 145 files changed, 189 insertions(+), 1082 deletions(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index 5a78c77bb..deb541014 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,6 +16,7 @@ SUBDIRS=util include lib \
 	plugins/preauth/encrypted_challenge \
 	kdc kadmin slave clients appl tests \
 	config-files gen-manpages
+WINSUBDIRS=include util lib ccapi windows clients appl
 BUILDTOP=$(REL).
 LOCALINCLUDES = -I$(srcdir) 
 PROG_LIBPATH=-L$(TOPLIBD)
@@ -45,31 +46,6 @@ config.status: $(top_srcdir)/config/shlib.conf
 ##DOS##!endif
 
 all-windows:: maybe-awk Makefile-windows
-	@echo Making autoconf.h in include
-	cd include
-	$(MAKE) -$(MFLAGS) autoconf.h
-	@echo Making in util
-	cd ..\util
-	$(MAKE) -$(MFLAGS)
-	@echo Making in include
-	cd ..\include
-	$(MAKE) -$(MFLAGS) 
-	@echo Making in lib
-	cd ..\lib
-	$(MAKE) -$(MFLAGS) 
-	@echo Making in ccapi
-	cd ..\ccapi
-	$(MAKE) -$(MFLAGS)
-	@echo Making in windows
-	cd ..\windows
-	$(MAKE) -$(MFLAGS) 
-	@echo Making in clients
-	cd ..\clients
-	$(MAKE) -$(MFLAGS)
-	@echo Making in appl
-	cd ..\appl
-	$(MAKE) -$(MFLAGS)
-	cd ..
 
 world::
 	date
@@ -370,26 +346,6 @@ WINMAKEFILES=Makefile \
 ##DOS##	$(WCONFIG) config < $@.in > $@
 
 clean-windows:: Makefile-windows
-	@echo Making clean in util
-	cd util
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in include
-	cd ..\include
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in lib
-	cd ..\lib
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in windows
-	cd ..\windows
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in clients
-	cd ..\clients
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in appl
-	cd ..\appl
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
-	@echo Making clean in root
 
 #
 # Renames DOS 8.3 filenames back to their proper, longer names.
diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in
index 015961110..32fe175c3 100644
--- a/src/appl/Makefile.in
+++ b/src/appl/Makefile.in
@@ -2,15 +2,4 @@ mydir=appl
 BUILDTOP=$(REL)..
 
 SUBDIRS= sample simple user_user gss-sample
-
-all-windows:: 
-	@echo Making in gss-sample
-	cd gss-sample
-	$(MAKE) -$(MFLAGS)
-	cd ..
-
-clean-windows::
-	@echo Making clean in lib\crypto
-	cd gss-sample
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
+WINSUBDIRS= gss-sample
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index 301f05cc9..87931b94d 100644
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -1,4 +1,4 @@
-mydir=appl/gss-sample
+mydir=appl$(S)gss-sample
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/appl/sample/Makefile.in b/src/appl/sample/Makefile.in
index dde058f55..63ac42e47 100644
--- a/src/appl/sample/Makefile.in
+++ b/src/appl/sample/Makefile.in
@@ -1,3 +1,3 @@
-mydir=appl/sample
+mydir=appl$(S)sample
 SUBDIRS = sclient sserver
 BUILDTOP=$(REL)..$(S)..
diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index 481d81e85..59d897446 100644
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -1,4 +1,4 @@
-mydir=appl/sample/sclient
+mydir=appl$(S)sample$(S)sclient
 
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index 01265331b..096dc7a63 100644
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -1,4 +1,4 @@
-mydir=appl/sample/sserver
+mydir=appl$(S)sample$(S)sserver
 
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in
index 7681efb68..a6056167f 100644
--- a/src/appl/simple/Makefile.in
+++ b/src/appl/simple/Makefile.in
@@ -1,3 +1,3 @@
-mydir=appl/simple
+mydir=appl$(S)simple
 SUBDIRS = client server
 BUILDTOP=$(REL)..$(S)..
diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index 3e53f5e13..c357c1253 100644
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -1,4 +1,4 @@
-mydir=appl/simple/client
+mydir=appl$(S)simple$(S)client
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index ef64bed6d..1795bc896 100644
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -1,4 +1,4 @@
-mydir=appl/simple/server
+mydir=appl$(S)simple$(S)server
 BUILDTOP=$(REL)..$(S)..$(S)..
 
 LOCALINCLUDES= -I.. -I$(srcdir)/..
diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index 0d45a1864..381ece63c 100644
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -1,4 +1,4 @@
-mydir=appl/user_user
+mydir=appl$(S)user_user
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DDEBUG
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/ccapi/Makefile.in b/src/ccapi/Makefile.in
index 43d5fc081..3f80d87e1 100644
--- a/src/ccapi/Makefile.in
+++ b/src/ccapi/Makefile.in
@@ -2,32 +2,4 @@ mydir=ccapi
 BUILDTOP=$(REL)..
 
 SUBDIRS= lib server test
-
-all-windows:: 
-	@echo Making in ccapi\lib\win
-	cd lib\win
-	cd
-	$(MAKE) -$(MFLAGS)
-	@echo Making in ccapi\server\win
-	cd ..\..\server\win
-	cd
-	$(MAKE) -$(MFLAGS)
-	@echo Making in ccapi\test
-	cd ..\..\test
-	cd
-	$(MAKE) -$(MFLAGS)
-
-clean-windows:: 
-	@echo Making clean in ccapi\lib\win
-	cd lib\win
-	cd
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in ccapi\server\win
-	cd ..\..\server\win
-	cd
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in ccapi\test
-	cd ..\..\test
-	cd
-	$(MAKE) -$(MFLAGS) clean
-
+WINSUBDIRS= lib\win server\win test
diff --git a/src/ccapi/common/Makefile.in b/src/ccapi/common/Makefile.in
index 7693485e3..5a6e5fdd5 100644
--- a/src/ccapi/common/Makefile.in
+++ b/src/ccapi/common/Makefile.in
@@ -1,4 +1,4 @@
-mydir=ccapi/common
+mydir=ccapi$(S)common
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS=unix
 
diff --git a/src/ccapi/common/unix/Makefile.in b/src/ccapi/common/unix/Makefile.in
index 4b176fc80..b2ebc9049 100644
--- a/src/ccapi/common/unix/Makefile.in
+++ b/src/ccapi/common/unix/Makefile.in
@@ -1,4 +1,4 @@
-mydir=ccapi/common/unix
+mydir=ccapi$(S)common$(S)unix
 BUILDTOP=$(REL)..$(S)..$(S)..
 
 STLIBOBJS=
diff --git a/src/ccapi/lib/Makefile.in b/src/ccapi/lib/Makefile.in
index 1e2e13d36..f2655488e 100644
--- a/src/ccapi/lib/Makefile.in
+++ b/src/ccapi/lib/Makefile.in
@@ -1,4 +1,4 @@
-mydir=ccapi/lib
+mydir=ccapi$(S)lib
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS=unix
 LOCALINCLUDES=-I$(srcdir)/../common -I.
diff --git a/src/ccapi/lib/unix/Makefile.in b/src/ccapi/lib/unix/Makefile.in
index 8a043c92a..455b6b7b1 100644
--- a/src/ccapi/lib/unix/Makefile.in
+++ b/src/ccapi/lib/unix/Makefile.in
@@ -1,4 +1,4 @@
-mydir=ccapi/lib/unix
+mydir=ccapi$(S)lib$(S)unix
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES= -I$(srcdir)/.. -I$(srcdir)/../../common
 
diff --git a/src/ccapi/server/Makefile.in b/src/ccapi/server/Makefile.in
index 0ca140ba6..0cfa43a3a 100644
--- a/src/ccapi/server/Makefile.in
+++ b/src/ccapi/server/Makefile.in
@@ -1,4 +1,4 @@
-mydir=ccapi/server
+mydir=ccapi$(S)server
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS=unix
 
diff --git a/src/ccapi/server/unix/Makefile.in b/src/ccapi/server/unix/Makefile.in
index 526826030..1d45a5fc1 100644
--- a/src/ccapi/server/unix/Makefile.in
+++ b/src/ccapi/server/unix/Makefile.in
@@ -1,4 +1,4 @@
-mydir=ccapi/server/unix
+mydir=ccapi$(S)server$(S)unix
 BUILDTOP=$(REL)..$(S)..$(S)..
 
 STLIBOBJS=
diff --git a/src/ccapi/server/win/Makefile.in b/src/ccapi/server/win/Makefile.in
index 36909b85e..d5da00136 100644
--- a/src/ccapi/server/win/Makefile.in
+++ b/src/ccapi/server/win/Makefile.in
@@ -106,4 +106,4 @@ clean::
 	if exist $(OUTPRE)*.map del $(OUTPRE)*.map
 	if exist $(OUTPRE)*.pdb del $(OUTPRE)*.pdb
 	if exist *.err del *.err
-    if exist $(SRCTMP) rm -rf $(SRCTMP)
+    if exist $(SRCTMP) rmdir /s /q $(SRCTMP)
diff --git a/src/clients/Makefile.in b/src/clients/Makefile.in
index 891da9e20..4ae836194 100644
--- a/src/clients/Makefile.in
+++ b/src/clients/Makefile.in
@@ -2,52 +2,6 @@ mydir=clients
 BUILDTOP=$(REL)..
 
 SUBDIRS= klist kinit kdestroy kpasswd ksu kvno kcpytkt kdeltkt
+WINSUBDIRS= klist kinit kdestroy kpasswd kvno kcpytkt kdeltkt
 
 NO_OUTPRE=1
-all-windows::
-	@echo Making all in clients\klist
-	cd klist
-	$(MAKE) -$(MFLAGS)
-	@echo Making all in clients\kdestroy
-	cd ..\kdestroy
-	$(MAKE) -$(MFLAGS)
-	@echo Making all in clients\kinit
-	cd ..\kinit
-	$(MAKE) -$(MFLAGS)
-	@echo Making all in clients\kpasswd
-	cd ..\kpasswd
-	$(MAKE) -$(MFLAGS)
-	@echo Making all in clients\kvno
-	cd ..\kvno
-	$(MAKE) -$(MFLAGS)
-	@echo Making all in clients\kcpytkt
-	cd ..\kcpytkt
-	$(MAKE) -$(MFLAGS)
-	@echo Making all in clients\kdeltkt
-	cd ..\kdeltkt
-	$(MAKE) -$(MFLAGS)
-	cd ..
-
-clean-windows::
-	@echo Making clean in clients\klist
-	cd klist
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in clients\kdestroy
-	cd ..\kdestroy
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in clients\kinit
-	cd ..\kinit
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in clients\kpasswd
-	cd ..\kpasswd
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in clients\kvno
-	cd ..\kvno
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in clients\kcpytkt
-	cd ..\kcpytkt
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in clients\kdeltkt
-	cd ..\kdeltkt
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index 64a2dff56..b3bb0b281 100644
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -1,4 +1,4 @@
-mydir=clients/kdestroy
+mydir=clients$(S)kdestroy
 BUILDTOP=$(REL)..$(S)..
 DEFS=
 
diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index d60b1c7ae..aeaba560f 100644
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/Makefile.in
@@ -1,4 +1,4 @@
-mydir=clients/kinit
+mydir=clients$(S)kinit
 BUILDTOP=$(REL)..$(S)..
 DEFS=
 
diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index af4375063..c2b4d412a 100644
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -1,4 +1,4 @@
-mydir=clients/klist
+mydir=clients$(S)klist
 BUILDTOP=$(REL)..$(S)..
 DEFS=
 
diff --git a/src/clients/kpasswd/Makefile.in b/src/clients/kpasswd/Makefile.in
index d53b92216..50abc89c6 100644
--- a/src/clients/kpasswd/Makefile.in
+++ b/src/clients/kpasswd/Makefile.in
@@ -1,4 +1,4 @@
-mydir=clients/kpasswd
+mydir=clients$(S)kpasswd
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/clients/ksu/Makefile.in b/src/clients/ksu/Makefile.in
index daf9059e9..9309b97ac 100644
--- a/src/clients/ksu/Makefile.in
+++ b/src/clients/ksu/Makefile.in
@@ -1,4 +1,4 @@
-mydir=clients/ksu
+mydir=clients$(S)ksu
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
 DEFS=
diff --git a/src/clients/kvno/Makefile.in b/src/clients/kvno/Makefile.in
index bbbb79c7a..741c73844 100644
--- a/src/clients/kvno/Makefile.in
+++ b/src/clients/kvno/Makefile.in
@@ -1,4 +1,4 @@
-mydir=clients/kvno
+mydir=clients$(S)kvno
 BUILDTOP=$(REL)..$(S)..
 DEFS=
 
diff --git a/src/config/win-post.in b/src/config/win-post.in
index 151fac687..6046e627e 100644
--- a/src/config/win-post.in
+++ b/src/config/win-post.in
@@ -34,7 +34,36 @@ Makefile: Makefile.in $(BUILDTOP)\config\win-pre.in $(BUILDTOP)\config\win-post.
 	$(WCONFIG) $(BUILDTOP)\config < Makefile.in > Makefile
 !endif
 
-!if  ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" )
+# Recurse into subdirs if WINSUBDIRS or SUBDIRS is defined.  Makefiles
+# can depend on all-recurse, clean-recurse, or check-recurse to perform
+# actions after recursion.
+!if defined(SUBDIRS) && !defined(WINSUBDIRS)
+WINSUBDIRS=$(SUBDIRS)
+!endif
+!ifdef WINSUBDIRS
+
+all-recurse:
+	@for %d in ($(WINSUBDIRS)) do @(echo Making in $(mydir)\%d && \
+		pushd %d && $(MAKE) -$(MFLAGS) && popd) || exit 1
+	@echo Making in $(mydir)
+all-windows:: all-recurse
+
+clean-recurse::
+	@for %d in ($(WINSUBDIRS)) do @(echo Making clean in $(mydir)\%d && \
+		pushd %d && $(MAKE) -$(MFLAGS) clean && popd) || exit 1
+	@echo Making clean in $(mydir)
+clean-windows:: clean-recurse
+
+check-recurse::
+	@for %d in ($(WINSUBDIRS)) do @(echo Making check in $(mydir)\%d && \
+		pushd %d && $(MAKE) -$(MFLAGS) check && popd) || exit 1
+	@echo Making check in $(mydir)
+check-windows:: check-recurse
+
+!endif # WINSUBDIRS
+
+# Use 64-bit LIBNAME and OBJFILE on 64-bit platforms, if defined.
+!if ("$(CPU)" == "IA64") || ("$(CPU)" == "AMD64") || ("$(CPU)" == "ALPHA64")
 !if defined(WIN64LIBNAME)
 LIBNAME=$(WIN64LIBNAME)
 !endif
@@ -43,6 +72,7 @@ OBJFILE=$(WIN64OBJFILE)
 !endif
 !endif
 
+# Build a library if LIBNAME is defined.
 !if defined(LIBNAME)
 
 !if !defined(OBJFILELIST)
@@ -59,6 +89,7 @@ $(LIBNAME): $(OBJFILEDEP)
 !endif # LIBNAME
 
 
+# Build an object file list if OBJFILE is defined.
 !if defined(OBJFILE)
 all-windows:: $(OBJFILE)
 !if defined(LIBOBJS)
@@ -76,17 +107,6 @@ $(OBJFILE): $(LIBOBJS)
 check::
 check-windows::
 
-!if defined(LIBNAME)
-clean-windows::
-# NO LONGER NEEDED BECAUSE WE CLEAN OUT THE DIR...
-#	if exist $(LIBNAME) del $(LIBNAME)
-!endif
-!if defined(OBJFILE)
-clean-windows::
-# NO LONGER NEEDED BECAUSE WE CLEAN OUT THE DIR...
-#	if exist $(OBJFILE) del $(OBJFILE)
-!endif
-
 clean-windows:: clean-windows-files clean-windows-dir
 
 
diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 5c178a24a..547fac31b 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -121,8 +121,9 @@ clean-unix::
 
 clean-windows::
 	$(RM) com_err.h profile.h
-	$(RM) gssapi\gssapi.h gssapi\gssapi_generic.h gssapi\gssapi_krb5.h gssapi\timestamp
-	if exist gssapi\nul rmdir gssapi
+	$(RM) gssapi\gssapi.h gssapi\gssapi_generic.h gssapi\gssapi_krb5.h
+	$(RM) gssapi\gssapi_ext.h gssapi\timestamp
+	if exist gssapi\nul rmdir /s /q gssapi
 	$(RM) osconf.h autoconf.h autoconf.stamp
 	@echo Making clean in include
 
diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in
index b5f54287e..c7ba8312e 100644
--- a/src/kadmin/cli/Makefile.in
+++ b/src/kadmin/cli/Makefile.in
@@ -1,4 +1,4 @@
-mydir=kadmin/cli
+mydir=kadmin$(S)cli
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in
index 454077069..2c13827e1 100644
--- a/src/kadmin/dbutil/Makefile.in
+++ b/src/kadmin/dbutil/Makefile.in
@@ -1,4 +1,4 @@
-mydir=kadmin/dbutil
+mydir=kadmin$(S)dbutil
 BUILDTOP=$(REL)..$(S)..
 DEFS=
 LOCALINCLUDES = -I.
diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in
index 607e58a53..930b1efc8 100644
--- a/src/kadmin/ktutil/Makefile.in
+++ b/src/kadmin/ktutil/Makefile.in
@@ -1,4 +1,4 @@
-mydir=kadmin/ktutil
+mydir=kadmin$(S)ktutil
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in
index d3111da4a..7872872d5 100644
--- a/src/kadmin/server/Makefile.in
+++ b/src/kadmin/server/Makefile.in
@@ -1,4 +1,4 @@
-mydir=kadmin/server
+mydir=kadmin$(S)server
 BUILDTOP=$(REL)..$(S)..
 KDB_DEP_LIB=$(DL_LIB) $(THREAD_LINKOPTS)
 DEFS=
diff --git a/src/kadmin/testing/Makefile.in b/src/kadmin/testing/Makefile.in
index 1f154ec55..0681e8eca 100644
--- a/src/kadmin/testing/Makefile.in
+++ b/src/kadmin/testing/Makefile.in
@@ -1,4 +1,4 @@
-mydir=kadmin/testing
+mydir=kadmin$(S)testing
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS = scripts util
 
diff --git a/src/kadmin/testing/scripts/Makefile.in b/src/kadmin/testing/scripts/Makefile.in
index 36ae3b490..1e14d6117 100644
--- a/src/kadmin/testing/scripts/Makefile.in
+++ b/src/kadmin/testing/scripts/Makefile.in
@@ -1,4 +1,4 @@
-mydir=kadmin/testing/scripts
+mydir=kadmin$(S)testing$(S)scripts
 BUILDTOP=$(REL)..$(S)..$(S)..
 PERL_PATH=@PERL_PATH@
 
diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in
index 3993c90a0..745a73ddd 100644
--- a/src/kadmin/testing/util/Makefile.in
+++ b/src/kadmin/testing/util/Makefile.in
@@ -1,4 +1,4 @@
-mydir=kadmin/testing/util
+mydir=kadmin$(S)testing$(S)util
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = $(TCL_INCLUDES) -I$(BUILDTOP)/lib/kdb/
 # Force Tcl headers to use stdarg.h, because krb5 does too, and if
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 07954f89b..4256f0586 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -1,5 +1,6 @@
 mydir=lib
 SUBDIRS=crypto krb5 gssapi rpc kdb kadm5 apputils
+WINSUBDIRS=crypto krb5 gssapi
 BUILDTOP=$(REL)..
 
 all-unix::
@@ -134,31 +135,5 @@ clean-windows::
 ##WIN32##gssapi.lib: $(GLIB)
 ##WIN32##profile.lib: $(PLIB)
 
-##WIN32##all-windows:: 
-##WIN32##	@echo Making in lib\crypto
-##WIN32##	cd crypto
-##WIN32##	$(MAKE) -$(MFLAGS)
-##WIN32##	@echo Making in lib\krb5
-##WIN32##	cd ..\krb5
-##WIN32##	$(MAKE) -$(MFLAGS)
-##WIN32##	@echo Making in lib\gssapi
-##WIN32##	cd ..\gssapi
-##WIN32##	$(MAKE) -$(MFLAGS) 
-##WIN32##	@echo Making in lib
-##WIN32##	cd ..
-
-##WIN32##all-windows:: lib-windows
+##WIN32##all-windows:: all-recurse lib-windows
 ##WIN32##lib-windows:: krb5.lib gssapi.lib
-
-##WIN32##clean-windows::
-##WIN32##	@echo Making clean in lib\crypto
-##WIN32##	cd crypto
-##WIN32##	$(MAKE) -$(MFLAGS) clean
-##WIN32##	@echo Making clean in lib\krb5
-##WIN32##	cd ..\krb5
-##WIN32##	$(MAKE) -$(MFLAGS) clean
-##WIN32##	@echo Making clean in lib\gssapi
-##WIN32##	cd ..\gssapi
-##WIN32##	$(MAKE) -$(MFLAGS) clean
-##WIN32##	@echo Making clean in lib
-##WIN32##	cd ..
diff --git a/src/lib/apputils/Makefile.in b/src/lib/apputils/Makefile.in
index 58273248b..75dd613dc 100644
--- a/src/lib/apputils/Makefile.in
+++ b/src/lib/apputils/Makefile.in
@@ -2,7 +2,7 @@ prefix=@prefix@
 bindir=@bindir@
 datadir=@datadir@
 mydatadir=$(datadir)/apputils
-mydir=lib/apputils
+mydir=lib$(S)apputils
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../lib/apputils
 SED = sed
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 12098d60c..464db261b 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto
+mydir=lib$(S)crypto
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS= krb $(CRYPTO_IMPL) crypto_tests
 
@@ -74,30 +74,6 @@ libcrypto.lib:
 
 clean-unix:: clean-liblinks clean-libs clean-libobjs
 
-all-windows::
-	cd krb
-	@echo Making in crypto\krb
-	$(MAKE) -$(MFLAGS)
-	cd ..\$(CRYPTO_IMPL)
-	@echo Making in crypto\$(CRYPTO_IMPL)
-	$(MAKE) -$(MFLAGS)
-	cd ..\crypto_tests
-	@echo Making in crypto\crypto_tests
-	$(MAKE) -$(MFLAGS)
-	cd ..
-
-clean-windows::
-	cd krb
-	@echo Making in clean crypto\krb
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\$(CRYPTO_IMPL)
-	@echo Making clean in crypto\$(CRYPTO_IMPL)
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\crypto_tests
-	@echo Making clean in crypto\crypto_tests
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
-
 @lib_frag@
 @libobj_frag@
 
diff --git a/src/lib/crypto/builtin/Makefile.in b/src/lib/crypto/builtin/Makefile.in
index 603c57cd0..66e16ce69 100644
--- a/src/lib/crypto/builtin/Makefile.in
+++ b/src/lib/crypto/builtin/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin
+mydir=lib$(S)crypto$(S)builtin
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS=camellia des aes md4 md5 sha1 sha2 enc_provider hash_provider
 LOCALINCLUDES = -I$(srcdir)/../krb 			\
@@ -72,103 +72,6 @@ t_cf2$(EXEEXT): t_cf2.$(OBJEXT) $(SUPPORT_DEPLIB)
 clean::
 	$(RM)  t_cf2 t_cf2.o  t_cf2.output
 
-
-
-
-all-windows::
-	cd des
-	@echo Making in crypto\builtin\des
-	$(MAKE) -$(MFLAGS)
-	cd ..\md4
-	@echo Making in crypto\builtin\md4
-	$(MAKE) -$(MFLAGS)
-	cd ..\md5
-	@echo Making in crypto\builtin\md5
-	$(MAKE) -$(MFLAGS)
-	cd ..\sha1
-	@echo Making in crypto\builtin\sha1
-	$(MAKE) -$(MFLAGS)
-	cd ..\sha2
-	@echo Making in crypto\builtin\sha2
-	$(MAKE) -$(MFLAGS)
-	cd ..\hash_provider
-	@echo Making in crypto\builtin\hash_provider
-	$(MAKE) -$(MFLAGS)
-	cd ..\enc_provider
-	@echo Making in crypto\builtin\enc_provider
-	$(MAKE) -$(MFLAGS)
-	cd ..\aes
-	@echo Making in crypto\builtin\aes
-	$(MAKE) -$(MFLAGS)
-	cd ..\camellia
-	@echo Making in crypto\builtin\camellia
-	$(MAKE) -$(MFLAGS)
-	cd ..
-	@echo Making in crypto\builtin
-
-clean-windows::
-	cd des
-	@echo Making clean in crypto\builtin\des
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\md4
-	@echo Making clean in crypto\builtin\md4
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\md5
-	@echo Making clean in crypto\builtin\md5
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\sha1
-	@echo Making clean in crypto\builtin\sha1
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\sha2
-	@echo Making clean in crypto\builtin\sha2
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\hash_provider
-	@echo Making clean in crypto\builtin\hash_provider
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\enc_provider
-	@echo Making clean in crypto\builtin\enc_provider
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\aes
-	@echo Making clean in crypto\builtin\aes
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\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\builtin\des
-	$(MAKE) -$(MFLAGS) check
-	cd ..\md4
-	@echo Making check in crypto\builtin\md4
-	$(MAKE) -$(MFLAGS) check
-	cd ..\md5
-	@echo Making check in crypto\builtin\md5
-	$(MAKE) -$(MFLAGS) check
-	cd ..\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\builtin\hash_provider
-	$(MAKE) -$(MFLAGS) check
-	cd ..\enc_provider
-	@echo Making check in crypto\builtin\enc_provider
-	$(MAKE) -$(MFLAGS) check
-	cd ..\aes
-	@echo Making check in crypto\builtin\aes
-	$(MAKE) -$(MFLAGS) check
-	cd ..\camellia
-	@echo Making check in crypto\builtin\camellia
-	$(MAKE) -$(MFLAGS) check
-	cd ..
-	@echo Making check in crypto\builtin
-
-
 @lib_frag@
 @libobj_frag@
 
diff --git a/src/lib/crypto/builtin/aes/Makefile.in b/src/lib/crypto/builtin/aes/Makefile.in
index 64f73a379..9a242cc45 100644
--- a/src/lib/crypto/builtin/aes/Makefile.in
+++ b/src/lib/crypto/builtin/aes/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/aes
+mydir=lib$(S)crypto$(S)builtin$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../../include
 DEFS=
diff --git a/src/lib/crypto/builtin/camellia/Makefile.in b/src/lib/crypto/builtin/camellia/Makefile.in
index 2ad3e73f6..b11716ecc 100644
--- a/src/lib/crypto/builtin/camellia/Makefile.in
+++ b/src/lib/crypto/builtin/camellia/Makefile.in
@@ -1,6 +1,6 @@
 thisconfigdir=../../../..
 myfulldir=lib/crypto/builtin/camellia
-mydir=lib/crypto/builtin/camellia
+mydir=lib$(S)crypto$(S)builtin$(S)camellia
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk \
 	 -I$(srcdir)/../../../../include -I$(srcdir)/../aes
diff --git a/src/lib/crypto/builtin/des/Makefile.in b/src/lib/crypto/builtin/des/Makefile.in
index 5001d48bf..9b5d81402 100644
--- a/src/lib/crypto/builtin/des/Makefile.in
+++ b/src/lib/crypto/builtin/des/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/des
+mydir=lib$(S)crypto$(S)builtin$(S)des
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb
 DEFS=
diff --git a/src/lib/crypto/builtin/enc_provider/Makefile.in b/src/lib/crypto/builtin/enc_provider/Makefile.in
index 80bfc60bd..e843d602a 100644
--- a/src/lib/crypto/builtin/enc_provider/Makefile.in
+++ b/src/lib/crypto/builtin/enc_provider/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/enc_provider
+mydir=lib$(S)crypto$(S)builtin$(S)enc_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../des 	\
 		-I$(srcdir)/../arcfour \
diff --git a/src/lib/crypto/builtin/hash_provider/Makefile.in b/src/lib/crypto/builtin/hash_provider/Makefile.in
index e91901ee5..f008e7118 100644
--- a/src/lib/crypto/builtin/hash_provider/Makefile.in
+++ b/src/lib/crypto/builtin/hash_provider/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/hash_provider
+mydir=lib$(S)crypto$(S)builtin$(S)hash_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \
 	-I$(srcdir)/../md5 -I$(srcdir)/../sha1 -I$(srcdir)/../../krb
diff --git a/src/lib/crypto/builtin/md4/Makefile.in b/src/lib/crypto/builtin/md4/Makefile.in
index 00ec64315..3dbeb5bd7 100644
--- a/src/lib/crypto/builtin/md4/Makefile.in
+++ b/src/lib/crypto/builtin/md4/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/md4
+mydir=lib$(S)crypto$(S)builtin$(S)md4
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)
 DEFS=
diff --git a/src/lib/crypto/builtin/md5/Makefile.in b/src/lib/crypto/builtin/md5/Makefile.in
index 840bb62b9..1ab1ce96f 100644
--- a/src/lib/crypto/builtin/md5/Makefile.in
+++ b/src/lib/crypto/builtin/md5/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/md5
+mydir=lib$(S)crypto$(S)builtin$(S)md5
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/crypto/builtin/sha1/Makefile.in b/src/lib/crypto/builtin/sha1/Makefile.in
index 719f63370..00e6cb6d4 100644
--- a/src/lib/crypto/builtin/sha1/Makefile.in
+++ b/src/lib/crypto/builtin/sha1/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/sha1
+mydir=lib$(S)crypto$(S)builtin$(S)sha1
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/crypto/builtin/sha2/Makefile.in b/src/lib/crypto/builtin/sha2/Makefile.in
index 3b854ec29..da176e66d 100644
--- a/src/lib/crypto/builtin/sha2/Makefile.in
+++ b/src/lib/crypto/builtin/sha2/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/builtin/sha2
+mydir=lib$(S)crypto$(S)builtin$(S)sha2
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/crypto/crypto_tests/Makefile.in b/src/lib/crypto/crypto_tests/Makefile.in
index 17e1683d6..50700fd6c 100644
--- a/src/lib/crypto/crypto_tests/Makefile.in
+++ b/src/lib/crypto/crypto_tests/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/crypto_tests
+mydir=lib$(S)crypto$(S)crypto_tests
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)/../$(CRYPTO_IMPL)/enc_provider \
 	-I$(srcdir)/../$(CRYPTO_IMPL)/hash_provider \
diff --git a/src/lib/crypto/krb/Makefile.in b/src/lib/crypto/krb/Makefile.in
index 7536bf80b..29c8897a9 100644
--- a/src/lib/crypto/krb/Makefile.in
+++ b/src/lib/crypto/krb/Makefile.in
@@ -1,7 +1,6 @@
-mydir=lib/crypto/krb
+mydir=lib$(S)crypto$(S)krb
 BUILDTOP=$(REL)..$(S)..$(S)..
-SUBDIRS= arcfour checksum crc32 dk \
-	prf rand2key old raw prng 
+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 \
@@ -159,100 +158,6 @@ depend:: $(SRCS)
 
 clean-unix:: clean-libobjs
 
-all-windows::
-	cd arcfour
-	@echo Making in crypto\krb\arcfour
-	$(MAKE) -$(MFLAGS)
-	cd ..\crc32
-	@echo Making in crypto\krb\crc32
-	$(MAKE) -$(MFLAGS)
-	cd ..\checksum
-	@echo Making in crypto\krb\checksum
-	$(MAKE) -$(MFLAGS)
-	cd ..\dk
-	@echo Making in crypto\krb\dk
-	$(MAKE) -$(MFLAGS)
-	cd ..\prf
-	@echo Making in crypto\krb\prf
-	$(MAKE) -$(MFLAGS)
-	cd ..\rand2key
-	@echo Making in crypto\krb\rand2key
-	$(MAKE) -$(MFLAGS)
-	cd ..\old
-	@echo Making in crypto\krb\old
-	$(MAKE) -$(MFLAGS)
-	cd ..\raw
-	@echo Making in crypto\krb\raw
-	$(MAKE) -$(MFLAGS)
-	cd ..\prng
-	@echo Making in crypto\krb\prng
-	$(MAKE) -$(MFLAGS)
-	cd ..
-	@echo Making in crypto\krb
-
-clean-windows::
-	cd arcfour
-	@echo Making in clean crypto\krb\arcfour
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\crc32
-	@echo Making in clean crypto\krb\crc32
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\checksum
-	@echo Making clean in crypto\krb\checksum
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\dk
-	@echo Making clean in crypto\krb\dk
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\prf
-	@echo Making clean in crypto\krb\prf
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\rand2key
-	@echo Making clean in crypto\krb\rand2key
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\old
-	@echo Making clean in crypto\krb\old
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\raw
-	@echo Making clean in crypto\krb\raw
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\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\krb\arcfour
-	$(MAKE) -$(MFLAGS) check
-	cd ..\crc32
-	@echo Making in check crypto\krb\crc32
-	$(MAKE) -$(MFLAGS) check
-	cd ..\checksum
-	@echo Making check in crypto\krb\checksum
-	$(MAKE) -$(MFLAGS) check
-	cd ..\dk
-	@echo Making check in crypto\krb\dk
-	$(MAKE) -$(MFLAGS) check
-	cd ..\prf
-	@echo Making check in crypto\krb\prf
-	$(MAKE) -$(MFLAGS) check
-	cd ..\rand2key
-	@echo Making check in crypto\krb\rand2key
-	$(MAKE) -$(MFLAGS) check
-	cd ..\old
-	@echo Making check in crypto\krb\old
-	$(MAKE) -$(MFLAGS) check
-	cd ..\raw
-	@echo Making check in crypto\krb\raw
-	$(MAKE) -$(MFLAGS) check
-	cd ..\prng
-	@echo Making check in crypto\krb\prng
-	$(MAKE) -$(MFLAGS) check
-	cd ..
-	@echo Making check in crypto\krb
-
-
 @lib_frag@
 @libobj_frag@
 
diff --git a/src/lib/crypto/krb/arcfour/Makefile.in b/src/lib/crypto/krb/arcfour/Makefile.in
index f3f0a9bb0..93af66273 100644
--- a/src/lib/crypto/krb/arcfour/Makefile.in
+++ b/src/lib/crypto/krb/arcfour/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/krb/arcfour
+mydir=lib$(S)crypto$(S)krb$(S)arcfour
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL) \
 	-I$(srcdir)/../../$(CRYPTO_IMPL)/md4
diff --git a/src/lib/crypto/krb/checksum/Makefile.in b/src/lib/crypto/krb/checksum/Makefile.in
index 65a8cbcf4..2d4148168 100644
--- a/src/lib/crypto/krb/checksum/Makefile.in
+++ b/src/lib/crypto/krb/checksum/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/krb/checksum
+mydir=lib$(S)crypto$(S)krb$(S)checksum
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../arcfour
 DEFS=
diff --git a/src/lib/crypto/krb/crc32/Makefile.in b/src/lib/crypto/krb/crc32/Makefile.in
index d46c73962..5360339e7 100644
--- a/src/lib/crypto/krb/crc32/Makefile.in
+++ b/src/lib/crypto/krb/crc32/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/krb/crc32
+mydir=lib$(S)crypto$(S)krb$(S)crc32
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/crypto/krb/dk/Makefile.in b/src/lib/crypto/krb/dk/Makefile.in
index 0a710110c..63e55b6ff 100644
--- a/src/lib/crypto/krb/dk/Makefile.in
+++ b/src/lib/crypto/krb/dk/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/krb/dk
+mydir=lib$(S)crypto$(S)krb$(S)dk
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/..  -I$(srcdir)/../../$(CRYPTO_IMPL)
 DEFS=
diff --git a/src/lib/crypto/krb/old/Makefile.in b/src/lib/crypto/krb/old/Makefile.in
index 0f21070cf..8cbd7fc0b 100644
--- a/src/lib/crypto/krb/old/Makefile.in
+++ b/src/lib/crypto/krb/old/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/krb/old
+mydir=lib$(S)crypto$(S)krb$(S)old
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../../$(CRYPTO_IMPL)/des -I$(srcdir)/.. -I$(srcdir)
 DEFS=
diff --git a/src/lib/crypto/krb/prf/Makefile.in b/src/lib/crypto/krb/prf/Makefile.in
index c2f412d8e..b57029fa0 100644
--- a/src/lib/crypto/krb/prf/Makefile.in
+++ b/src/lib/crypto/krb/prf/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/krb/prf
+mydir=lib$(S)crypto$(S)krb$(S)prf
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/.. 		\
 		-I$(srcdir)/../dk			\
diff --git a/src/lib/crypto/krb/prng/Makefile.in b/src/lib/crypto/krb/prng/Makefile.in
index cef3710cf..843fdd2f2 100644
--- a/src/lib/crypto/krb/prng/Makefile.in
+++ b/src/lib/crypto/krb/prng/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/krb/prng
+mydir=lib$(S)crypto$(S)krb$(S)prng
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 SUBDIRS= $(PRNG_ALG)
 LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../../$(CRYPTO_IMPL)/enc_provider \
@@ -41,27 +41,6 @@ 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 367eb0174..544f4a154 100644
--- a/src/lib/crypto/krb/prng/fortuna/Makefile.in
+++ b/src/lib/crypto/krb/prng/fortuna/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/krb/prng/fortuna
+mydir=lib$(S)crypto$(S)krb$(S)prng$(S)fortuna
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \
 		-I$(srcdir)/../../../$(CRYPTO_IMPL)		\
diff --git a/src/lib/crypto/krb/prng/nss/Makefile.in b/src/lib/crypto/krb/prng/nss/Makefile.in
index d6d29b932..a02607672 100644
--- a/src/lib/crypto/krb/prng/nss/Makefile.in
+++ b/src/lib/crypto/krb/prng/nss/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/krb/prng/nss
+mydir=lib$(S)crypto$(S)krb$(S)prng$(S)nss
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \
diff --git a/src/lib/crypto/krb/prng/yarrow/Makefile.in b/src/lib/crypto/krb/prng/yarrow/Makefile.in
index 93d6bc44c..3ecb64a4f 100644
--- a/src/lib/crypto/krb/prng/yarrow/Makefile.in
+++ b/src/lib/crypto/krb/prng/yarrow/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/krb/prng/yarrow
+mydir=lib$(S)crypto$(S)krb$(S)prng$(S)yarrow
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \
 		-I$(srcdir)/../../../$(CRYPTO_IMPL)		\
diff --git a/src/lib/crypto/krb/rand2key/Makefile.in b/src/lib/crypto/krb/rand2key/Makefile.in
index f6975d7d9..7d1fb0705 100644
--- a/src/lib/crypto/krb/rand2key/Makefile.in
+++ b/src/lib/crypto/krb/rand2key/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/krb/rand2key
+mydir=lib$(S)crypto$(S)krb$(S)rand2key
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/. -I$(srcdir)/../../$(CRYPTO_IMPL)/des
 DEFS=
diff --git a/src/lib/crypto/krb/raw/Makefile.in b/src/lib/crypto/krb/raw/Makefile.in
index a9c3b09d8..f0b32b536 100644
--- a/src/lib/crypto/krb/raw/Makefile.in
+++ b/src/lib/crypto/krb/raw/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/krb/raw
+mydir=lib$(S)crypto$(S)krb$(S)raw
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../$(CRYPTO_IMPL)
 DEFS=
diff --git a/src/lib/crypto/nss/Makefile.in b/src/lib/crypto/nss/Makefile.in
index 7ce3cc8a9..7016e924b 100644
--- a/src/lib/crypto/nss/Makefile.in
+++ b/src/lib/crypto/nss/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/nss
+mydir=lib$(S)crypto$(S)nss
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS=des aes	camellia md4 md5  sha1 sha2 enc_provider hash_provider
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
@@ -18,12 +18,6 @@ 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)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)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
-
 STLIBOBJS=\
 	hmac.o	\
 	pbkdf2.o		
@@ -51,8 +45,6 @@ SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST 	\
 		aes/OBJS.ST			\
 		camellia/OBJS.ST
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 includes:: depend
 
@@ -60,97 +52,6 @@ depend:: $(SRCS)
 
 clean-unix:: clean-libobjs
 
-all-windows::
-	cd ..\des
-	@echo Making in crypto\des
-	$(MAKE) -$(MFLAGS)
-	cd ..\md4
-	@echo Making in crypto\md4
-	$(MAKE) -$(MFLAGS)
-	cd ..\md5
-	@echo Making in crypto\md5
-	$(MAKE) -$(MFLAGS)
-	cd ..\sha1
-	@echo Making in crypto\sha1
-	$(MAKE) -$(MFLAGS)
-	cd ..\sha2
-	@echo Making in crypto\sh2a
-	$(MAKE) -$(MFLAGS)
-	cd ..\hash_provider
-	@echo Making in crypto\hash_provider
-	$(MAKE) -$(MFLAGS)
-	cd ..\enc_provider
-	@echo Making in crypto\enc_provider
-	$(MAKE) -$(MFLAGS)
-	cd ..\aes
-	@echo Making in crypto\aes
-	$(MAKE) -$(MFLAGS)
-	cd ..\camellia
-	@echo Making in crypto\aes
-	$(MAKE) -$(MFLAGS)
-	cd ..
-
-clean-windows::
-	cd ..\des
-	@echo Making clean in crypto\des
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\md4
-	@echo Making clean in crypto\md4
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\md5
-	@echo Making clean in crypto\md5
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\sha2
-	@echo Making clean in crypto\sha2
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\sha1
-	@echo Making clean in crypto\sha1
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\hash_provider
-	@echo Making clean in crypto\hash_provider
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\enc_provider
-	@echo Making clean in crypto\enc_provider
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\aes
-	@echo Making clean in crypto\aes
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\camellia
-	@echo Making clean in crypto\aes
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
-
-check-windows::
-	cd ..\des
-	@echo Making check in crypto\des
-	$(MAKE) -$(MFLAGS) check
-	cd ..\md4
-	@echo Making check in crypto\md4
-	$(MAKE) -$(MFLAGS) check
-	cd ..\md5
-	@echo Making check in crypto\md5
-	$(MAKE) -$(MFLAGS) check
-	cd ..\sha1
-	@echo Making check in crypto\sha1
-	$(MAKE) -$(MFLAGS) check
-	cd ..\sha2
-	@echo Making check in crypto\sha2
-	$(MAKE) -$(MFLAGS) check
-	cd ..\hash_provider
-	@echo Making check in crypto\hash_provider
-	$(MAKE) -$(MFLAGS) check
-	cd ..\enc_provider
-	@echo Making check in crypto\enc_provider
-	$(MAKE) -$(MFLAGS) check
-	cd ..\aes
-	@echo Making check in crypto\aes
-	$(MAKE) -$(MFLAGS) check
-	cd ..\camellia
-	@echo Making check in crypto\aes
-	$(MAKE) -$(MFLAGS) check
-	cd ..
-
-
 @lib_frag@
 @libobj_frag@
 
diff --git a/src/lib/crypto/nss/aes/Makefile.in b/src/lib/crypto/nss/aes/Makefile.in
index 9855eafb0..ffbd4ba50 100644
--- a/src/lib/crypto/nss/aes/Makefile.in
+++ b/src/lib/crypto/nss/aes/Makefile.in
@@ -2,15 +2,11 @@
 # system currently assumes that all modules have the same directory
 # structure.
 
-mydir=lib/crypto/nss/aes
+mydir=lib$(S)crypto$(S)nss$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../../include
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=aes
-##DOS##OBJFILE=..\$(OUTPRE)aes.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -21,20 +17,13 @@ OBJS=
 SRCS=
 
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs 
 
 includes:: depend
 
 depend:: $(SRCS)
 
-check:: 
-
-
 clean-unix:: clean-libobjs
 
-clean::
-
 @libobj_frag@
 
diff --git a/src/lib/crypto/nss/camellia/Makefile.in b/src/lib/crypto/nss/camellia/Makefile.in
index c937f2197..b8feffc5d 100644
--- a/src/lib/crypto/nss/camellia/Makefile.in
+++ b/src/lib/crypto/nss/camellia/Makefile.in
@@ -2,15 +2,11 @@
 # system currently assumes that all modules have the same directory
 # structure.
 
-mydir=lib/crypto/nss/camellia
+mydir=lib$(S)crypto$(S)nss$(S)camellia
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../../include
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=camellia
-##DOS##OBJFILE=..\$(OUTPRE)camellia.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -21,20 +17,13 @@ OBJS=
 SRCS=
 
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs 
 
 includes:: depend
 
 depend:: $(SRCS)
 
-check:: 
-
-
 clean-unix:: clean-libobjs
 
-clean::
-
 @libobj_frag@
 
diff --git a/src/lib/crypto/nss/des/Makefile.in b/src/lib/crypto/nss/des/Makefile.in
index dc0e5e8ee..c8ab6e429 100644
--- a/src/lib/crypto/nss/des/Makefile.in
+++ b/src/lib/crypto/nss/des/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/nss/des
+mydir=lib$(S)crypto$(S)nss$(S)des
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb \
@@ -6,10 +6,6 @@ LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb \
 
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=des
-##DOS##OBJFILE=..\$(OUTPRE)des.lst
-
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
@@ -31,20 +27,12 @@ SRCS=	$(srcdir)/f_parity.c	\
 	$(srcdir)/string2key.c
 
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
-check-unix:: 
-
 includes:: depend
 
 depend:: $(SRCS)
 
-check-windows::
-
-clean::
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
diff --git a/src/lib/crypto/nss/enc_provider/Makefile.in b/src/lib/crypto/nss/enc_provider/Makefile.in
index f1ed5fb06..579072df3 100644
--- a/src/lib/crypto/nss/enc_provider/Makefile.in
+++ b/src/lib/crypto/nss/enc_provider/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/nss/enc_provider
+mydir=lib$(S)crypto$(S)nss$(S)enc_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/../des 	\
@@ -10,10 +10,6 @@ LOCALINCLUDES = -I$(srcdir)/../des 	\
 		$(CRYPTO_IMPL_CFLAGS)
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=enc_provider
-##DOS##OBJFILE=..\$(OUTPRE)enc_prov.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -41,8 +37,6 @@ SRCS= \
 	$(srcdir)/camellia.c 	\
 	$(srcdir)/rc4.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
diff --git a/src/lib/crypto/nss/hash_provider/Makefile.in b/src/lib/crypto/nss/hash_provider/Makefile.in
index 36ba7b2df..719b50079 100644
--- a/src/lib/crypto/nss/hash_provider/Makefile.in
+++ b/src/lib/crypto/nss/hash_provider/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/nss/hash_provider
+mydir=lib$(S)crypto$(S)nss$(S)hash_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \
@@ -7,10 +7,6 @@ LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \
 
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=hash_provider
-##DOS##OBJFILE=..\$(OUTPRE)hash_pro.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -33,8 +29,6 @@ SRCS=	$(srcdir)/hash_gen.c	\
 	$(srcdir)/hash_md5.c 	\
 	$(srcdir)/hash_sha1.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
diff --git a/src/lib/crypto/nss/md4/Makefile.in b/src/lib/crypto/nss/md4/Makefile.in
index f7cb02835..dfb0182fa 100644
--- a/src/lib/crypto/nss/md4/Makefile.in
+++ b/src/lib/crypto/nss/md4/Makefile.in
@@ -1,12 +1,8 @@
-mydir=lib/crypto/nss/md4
+mydir=lib$(S)crypto$(S)nss$(S)md4
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=md4
-##DOS##OBJFILE=..\$(OUTPRE)md4.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -16,21 +12,12 @@ OBJS= $(OUTPRE)md4.$(OBJEXT)
 
 SRCS= $(srcdir)/md4.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-
-check-unix:: 
-
-check-windows::
-
-clean:: 
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
diff --git a/src/lib/crypto/nss/md5/Makefile.in b/src/lib/crypto/nss/md5/Makefile.in
index 83699a3f1..b0cde50e9 100644
--- a/src/lib/crypto/nss/md5/Makefile.in
+++ b/src/lib/crypto/nss/md5/Makefile.in
@@ -1,11 +1,7 @@
-mydir=lib/crypto/nss/md5
+mydir=lib$(S)crypto$(S)nss$(S)md5
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=md5
-##DOS##OBJFILE=..\$(OUTPRE)md5.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
@@ -18,20 +14,12 @@ OBJS= $(OUTPRE)md5.$(OBJEXT)
 
 SRCS= $(srcdir)/md5.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-check-unix:: 
-
-check-windows::
-
-clean:: 
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
diff --git a/src/lib/crypto/nss/sha1/Makefile.in b/src/lib/crypto/nss/sha1/Makefile.in
index 7afeb3813..82d6d9b91 100644
--- a/src/lib/crypto/nss/sha1/Makefile.in
+++ b/src/lib/crypto/nss/sha1/Makefile.in
@@ -1,13 +1,9 @@
-mydir=lib/crypto/nss/sha1
+mydir=lib$(S)crypto$(S)nss$(S)sha1
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS)
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=sha1
-##DOS##OBJFILE=..\$(OUTPRE)sha1.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -17,16 +13,12 @@ OBJS= $(OUTPRE)shs.$(OBJEXT)
 
 SRCS= $(srcdir)/shs.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-clean::
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
diff --git a/src/lib/crypto/nss/sha2/Makefile.in b/src/lib/crypto/nss/sha2/Makefile.in
index c0605e8de..a8edb60d9 100644
--- a/src/lib/crypto/nss/sha2/Makefile.in
+++ b/src/lib/crypto/nss/sha2/Makefile.in
@@ -1,13 +1,9 @@
-mydir=lib/crypto/nss/sha2
+mydir=lib$(S)crypto$(S)nss$(S)sha2
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 CRYPTO_IMPL_CFLAGS=@CRYPTO_IMPL_CFLAGS@
 LOCALINCLUDES = -I$(srcdir)/.. $(CRYPTO_IMPL_CFLAGS)
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=sha1
-##DOS##OBJFILE=..\$(OUTPRE)sha2.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -17,16 +13,12 @@ OBJS= $(OUTPRE)sha2.$(OBJEXT)
 
 SRCS= $(srcdir)/sha2.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-clean::
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
diff --git a/src/lib/crypto/openssl/Makefile.in b/src/lib/crypto/openssl/Makefile.in
index f333c17ab..ff43d56d8 100644
--- a/src/lib/crypto/openssl/Makefile.in
+++ b/src/lib/crypto/openssl/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/openssl
+mydir=lib$(S)crypto$(S)openssl
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS=camellia des aes md4 md5  sha1 sha2 enc_provider hash_provider
 LOCALINCLUDES = -I$(srcdir)/../krb 			\
@@ -15,12 +15,6 @@ 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)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)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
-
 STLIBOBJS=\
 	hmac.o	\
 	init.o	\
@@ -49,8 +43,6 @@ SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST 	\
 		hash_provider/OBJS.ST 		\
 		aes/OBJS.ST 
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 includes:: depend
 
@@ -58,85 +50,6 @@ depend:: $(SRCS)
 
 clean-unix:: clean-libobjs
 
-all-windows::
-	cd ..\des
-	@echo Making in crypto\des
-	$(MAKE) -$(MFLAGS)
-	cd ..\md4
-	@echo Making in crypto\md4
-	$(MAKE) -$(MFLAGS)
-	cd ..\md5
-	@echo Making in crypto\md5
-	$(MAKE) -$(MFLAGS)
-	cd ..\sha1
-	@echo Making in crypto\sha1
-	$(MAKE) -$(MFLAGS)
-	cd ..\sha2
-	@echo Making in crypto\sha2
-	$(MAKE) -$(MFLAGS)
-	cd ..\hash_provider
-	@echo Making in crypto\hash_provider
-	$(MAKE) -$(MFLAGS)
-	cd ..\enc_provider
-	@echo Making in crypto\enc_provider
-	$(MAKE) -$(MFLAGS)
-	cd ..\aes
-	@echo Making in crypto\aes
-	$(MAKE) -$(MFLAGS)
-	cd ..
-
-clean-windows::
-	cd ..\des
-	@echo Making clean in crypto\des
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\md4
-	@echo Making clean in crypto\md4
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\md5
-	@echo Making clean in crypto\md5
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\sha1
-	@echo Making clean in crypto\sha1
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\sha2
-	@echo Making clean in crypto\sha2
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\hash_provider
-	@echo Making clean in crypto\hash_provider
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\enc_provider
-	@echo Making clean in crypto\enc_provider
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\aes
-	@echo Making clean in crypto\aes
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
-
-check-windows::
-	cd ..\des
-	@echo Making check in crypto\des
-	$(MAKE) -$(MFLAGS) check
-	cd ..\md4
-	@echo Making check in crypto\md4
-	$(MAKE) -$(MFLAGS) check
-	cd ..\md5
-	@echo Making check in crypto\md5
-	$(MAKE) -$(MFLAGS) check
-	cd ..\sha1
-	@echo Making check in crypto\sha1
-	$(MAKE) -$(MFLAGS) check
-	cd ..\hash_provider
-	@echo Making check in crypto\hash_provider
-	$(MAKE) -$(MFLAGS) check
-	cd ..\enc_provider
-	@echo Making check in crypto\enc_provider
-	$(MAKE) -$(MFLAGS) check
-	cd ..\aes
-	@echo Making check in crypto\aes
-	$(MAKE) -$(MFLAGS) check
-	cd ..
-
-
 @lib_frag@
 @libobj_frag@
 
diff --git a/src/lib/crypto/openssl/aes/Makefile.in b/src/lib/crypto/openssl/aes/Makefile.in
index 6352c3dc2..b8a7de924 100644
--- a/src/lib/crypto/openssl/aes/Makefile.in
+++ b/src/lib/crypto/openssl/aes/Makefile.in
@@ -2,15 +2,11 @@
 # system currently assumes that all modules have the same directory
 # structure.
 
-mydir=lib/crypto/openssl/aes
+mydir=lib$(S)crypto$(S)openssl$(S)aes
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../../include
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=aes
-##DOS##OBJFILE=..\$(OUTPRE)aes.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -20,21 +16,13 @@ OBJS=
 
 SRCS=
 
-
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs 
 
 includes:: depend
 
 depend:: $(SRCS)
 
-check:: 
-
-
 clean-unix:: clean-libobjs
 
-clean::
-
 @libobj_frag@
 
diff --git a/src/lib/crypto/openssl/camellia/Makefile.in b/src/lib/crypto/openssl/camellia/Makefile.in
index 5e36d5070..c300cd455 100644
--- a/src/lib/crypto/openssl/camellia/Makefile.in
+++ b/src/lib/crypto/openssl/camellia/Makefile.in
@@ -2,15 +2,11 @@
 # system currently assumes that all modules have the same directory
 # structure.
 
-mydir=lib/crypto/openssl/camellia
+mydir=lib$(S)crypto$(S)openssl$(S)camellia
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../krb/dk  -I$(srcdir)/../../../../include
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=camellia
-##DOS##OBJFILE=..\$(OUTPRE)camellia.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -21,20 +17,13 @@ OBJS=
 SRCS=
 
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs 
 
 includes:: depend
 
 depend:: $(SRCS)
 
-check:: 
-
-
 clean-unix:: clean-libobjs
 
-clean::
-
 @libobj_frag@
 
diff --git a/src/lib/crypto/openssl/des/Makefile.in b/src/lib/crypto/openssl/des/Makefile.in
index 627b5cc7f..335c7e53c 100644
--- a/src/lib/crypto/openssl/des/Makefile.in
+++ b/src/lib/crypto/openssl/des/Makefile.in
@@ -1,12 +1,8 @@
-mydir=lib/crypto/openssl/des
+mydir=lib$(S)crypto$(S)openssl$(S)des
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. -I$(srcdir)/../../krb
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=des
-##DOS##OBJFILE=..\$(OUTPRE)des.lst
-
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
@@ -28,20 +24,12 @@ SRCS=	$(srcdir)/f_parity.c	\
 	$(srcdir)/string2key.c
 
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
-check-unix:: 
-
 includes:: depend
 
 depend:: $(SRCS)
 
-check-windows::
-
-clean::
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
diff --git a/src/lib/crypto/openssl/enc_provider/Makefile.in b/src/lib/crypto/openssl/enc_provider/Makefile.in
index e974da406..24f6b3045 100644
--- a/src/lib/crypto/openssl/enc_provider/Makefile.in
+++ b/src/lib/crypto/openssl/enc_provider/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/crypto/openssl/enc_provider
+mydir=lib$(S)crypto$(S)openssl$(S)enc_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../des 	\
 		-I$(srcdir)/../arcfour \
@@ -9,10 +9,6 @@ LOCALINCLUDES = -I$(srcdir)/../des 	\
 		-I$(srcdir)/.. -I$(srcdir)/.
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=enc_provider
-##DOS##OBJFILE=..\$(OUTPRE)enc_prov.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -39,8 +35,6 @@ SRCS= \
 	$(srcdir)/camellia.c 	\
 	$(srcdir)/rc4.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
@@ -50,4 +44,3 @@ depend:: $(SRCS)
 clean-unix:: clean-libobjs
 
 @libobj_frag@
-
diff --git a/src/lib/crypto/openssl/hash_provider/Makefile.in b/src/lib/crypto/openssl/hash_provider/Makefile.in
index b5a7dcfeb..472dbd393 100644
--- a/src/lib/crypto/openssl/hash_provider/Makefile.in
+++ b/src/lib/crypto/openssl/hash_provider/Makefile.in
@@ -1,13 +1,9 @@
-mydir=lib/crypto/openssl/hash_provider
+mydir=lib$(S)crypto$(S)openssl$(S)hash_provider
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/../../krb/crc32 -I$(srcdir)/../md4 \
 	-I$(srcdir)/../md5 -I$(srcdir)/../sha1 -I$(srcdir)/../../krb
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=hash_provider
-##DOS##OBJFILE=..\$(OUTPRE)hash_pro.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -27,8 +23,6 @@ SRCS=	$(srcdir)/hash_crc32.c	\
 	$(srcdir)/hash_md5.c 	\
 	$(srcdir)/hash_sha1.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
diff --git a/src/lib/crypto/openssl/md4/Makefile.in b/src/lib/crypto/openssl/md4/Makefile.in
index f212c6d51..550d7df60 100644
--- a/src/lib/crypto/openssl/md4/Makefile.in
+++ b/src/lib/crypto/openssl/md4/Makefile.in
@@ -1,12 +1,8 @@
-mydir=lib/crypto/openssl/md4
+mydir=lib$(S)crypto$(S)openssl$(S)md4
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=md4
-##DOS##OBJFILE=..\$(OUTPRE)md4.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -16,21 +12,12 @@ OBJS= $(OUTPRE)md4.$(OBJEXT)
 
 SRCS= $(srcdir)/md4.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-
-check-unix:: 
-
-check-windows::
-
-clean:: 
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
diff --git a/src/lib/crypto/openssl/md5/Makefile.in b/src/lib/crypto/openssl/md5/Makefile.in
index 1b693c420..9c3d34091 100644
--- a/src/lib/crypto/openssl/md5/Makefile.in
+++ b/src/lib/crypto/openssl/md5/Makefile.in
@@ -1,11 +1,7 @@
-mydir=lib/crypto/openssl/md5
+mydir=lib$(S)crypto$(S)openssl$(S)md5
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=md5
-##DOS##OBJFILE=..\$(OUTPRE)md5.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -15,20 +11,12 @@ OBJS= $(OUTPRE)md5.$(OBJEXT)
 
 SRCS= $(srcdir)/md5.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-check-unix:: 
-
-check-windows::
-
-clean:: 
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
diff --git a/src/lib/crypto/openssl/sha1/Makefile.in b/src/lib/crypto/openssl/sha1/Makefile.in
index 0ec25872e..b2dcec6b9 100644
--- a/src/lib/crypto/openssl/sha1/Makefile.in
+++ b/src/lib/crypto/openssl/sha1/Makefile.in
@@ -1,11 +1,7 @@
-mydir=lib/crypto/openssl/sha1
+mydir=lib$(S)crypto$(S)openssl$(S)sha1
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=sha1
-##DOS##OBJFILE=..\$(OUTPRE)sha1.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -15,16 +11,12 @@ OBJS= $(OUTPRE)shs.$(OBJEXT)
 
 SRCS= $(srcdir)/shs.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-clean::
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
diff --git a/src/lib/crypto/openssl/sha2/Makefile.in b/src/lib/crypto/openssl/sha2/Makefile.in
index 6a4a27648..edb93bd27 100644
--- a/src/lib/crypto/openssl/sha2/Makefile.in
+++ b/src/lib/crypto/openssl/sha2/Makefile.in
@@ -1,11 +1,7 @@
-mydir=lib/crypto/openssl/sha2
+mydir=lib$(S)crypto$(S)openssl$(S)sha2
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFS=
 
-##DOS##BUILDTOP = ..\..\..\..
-##DOS##PREFIXDIR=sha2
-##DOS##OBJFILE=..\$(OUTPRE)sha256.lst
-
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 
@@ -15,16 +11,12 @@ OBJS= $(OUTPRE)sha256.$(OBJEXT)
 
 SRCS= $(srcdir)/sha256.c
 
-##DOS##LIBOBJS = $(OBJS)
-
 all-unix:: all-libobjs
 
 includes:: depend
 
 depend:: $(SRCS)
 
-clean::
-
 clean-unix:: clean-libobjs
 
 @libobj_frag@
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index 1316c29fe..4a742ecc6 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/gssapi
+mydir=lib$(S)gssapi
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS= generic krb5 spnego mechglue
 DEFS=-D_GSS_STATIC_LINK=1
@@ -56,37 +56,6 @@ merged-gssapi-header.h: $(EXPORTED_HEADERS)
 verify-calling-conventions-gssapi: merged-gssapi-header.h
 	$(PERL) -w $(top_srcdir)/util/def-check.pl merged-gssapi-header.h $(srcdir)/../gssapi32.def
 
-all-windows::
-	cd generic
-	@echo Making in gssapi\generic
-	$(MAKE) -$(MFLAGS)
-	cd ..\krb5
-	@echo Making in gssapi\krb5
-	$(MAKE) -$(MFLAGS)
-	cd ..\mechglue
-	@echo Making in gssapi\mechglue
-	$(MAKE) -$(MFLAGS)
-	cd ..\spnego
-	@echo Making in gssapi\spnego
-	$(MAKE) -$(MFLAGS)
-	cd ..
-
-clean-windows::
-	cd generic
-	@echo Making clean in gssapi\generic
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\krb5
-	@echo Making clean in gssapi\krb5
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\mechglue
-	@echo Making clean in gssapi\mechglue
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\spnego
-	@echo Making clean in gssapi\spnego
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
-	@echo Making clean in gssapi
-
 # These rules are an attempt to handle several different problems:
 #
 # Certain files in subdirectories must be made current by the
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index d68e5f56b..9221d0b9a 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/gssapi/generic
+mydir=lib$(S)gssapi$(S)generic
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/..
 DEFS=
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index a439bef7c..0ff0d39b2 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/gssapi/krb5
+mydir=lib$(S)gssapi$(S)krb5
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../mechglue -I$(srcdir)/../mechglue
 DEFS=-D_GSS_STATIC_LINK=1
@@ -237,7 +237,8 @@ error_map.h: $(top_srcdir)/util/gen-map.pl \
 		VALUE="char *" \
 		COMPARE=compare_OM_uint32 \
 		FREEVALUE=free_string
-	$(MV) error_map.new error_map.h
+	$(RM) $@
+	$(MV) error_map.new $@
 
 clean-unix::
 	$(RM) $(BUILDTOP)/include/gssapi/gssapi_krb5.h
diff --git a/src/lib/gssapi/mechglue/Makefile.in b/src/lib/gssapi/mechglue/Makefile.in
index d2dccb46b..7bb2069da 100644
--- a/src/lib/gssapi/mechglue/Makefile.in
+++ b/src/lib/gssapi/mechglue/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/gssapi/mechglue
+mydir=lib$(S)gssapi$(S)mechglue
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../krb5 -I$(srcdir)/../krb5 -I../spnego -I$(srcdir)/../spnego
 DEFS=-D_GSS_STATIC_LINK=1
diff --git a/src/lib/gssapi/spnego/Makefile.in b/src/lib/gssapi/spnego/Makefile.in
index 16741eba4..49f67abc5 100644
--- a/src/lib/gssapi/spnego/Makefile.in
+++ b/src/lib/gssapi/spnego/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/gssapi/spnego
+mydir=lib$(S)gssapi$(S)spnego
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I. -I$(srcdir) -I$(srcdir)/.. -I../generic -I$(srcdir)/../generic -I../mechglue -I$(srcdir)/../mechglue
 DEFS=-D_GSS_STATIC_LINK=1
diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in
index 24da56550..92085175f 100644
--- a/src/lib/kadm5/Makefile.in
+++ b/src/lib/kadm5/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/kadm5
+mydir=lib$(S)kadm5
 BUILDTOP=$(REL)..$(S)..
 SUBDIRS = clnt srv unit-test
 DEFS=
diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in
index 81aeb2027..beda5da55 100644
--- a/src/lib/kadm5/clnt/Makefile.in
+++ b/src/lib/kadm5/clnt/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/kadm5/clnt
+mydir=lib$(S)kadm5$(S)clnt
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5
 DEFS=
diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in
index 378e03c76..d57d6f08f 100644
--- a/src/lib/kadm5/srv/Makefile.in
+++ b/src/lib/kadm5/srv/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/kadm5/srv
+mydir=lib$(S)kadm5$(S)srv
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5 \
 	-I$(top_srcdir)/lib/gssapi/krb5 -I$(top_srcdir)/lib/gssapi/generic \
diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in
index ecd64c124..f8d7b7847 100644
--- a/src/lib/kadm5/unit-test/Makefile.in
+++ b/src/lib/kadm5/unit-test/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/kadm5/unit-test
+mydir=lib$(S)kadm5$(S)unit-test
 BUILDTOP=$(REL)..$(S)..$(S)..
 DEFINES =
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 3781dfb9a..c49e1b56c 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/kdb
+mydir=lib$(S)kdb
 BUILDTOP=$(REL)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index adaba32aa..9b95c02ba 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -1,7 +1,8 @@
-mydir=lib/krb5
+mydir=lib$(S)krb5
 BUILDTOP=$(REL)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/ccache -I$(srcdir)/keytab -I$(srcdir)/rcache -I$(srcdir)/os -I$(srcdir)/unicode
 SUBDIRS= error_tables asn.1 ccache keytab krb os rcache unicode
+WINSUBDIRS= $(SUBDIRS) posix
 DEFS=
 
 ##DOSBUILDTOP = ..\..
@@ -68,67 +69,6 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs
 clean-windows::
 	$(RM) $(OUTPRE)krb5.lib krb5.bak
 
-all-windows::
-	cd asn.1
-	@echo Making in krb5\asn.1
-	$(MAKE) -$(MFLAGS)
-	cd ..\ccache
-	@echo Making in krb5\ccache
-	$(MAKE) -$(MFLAGS)
-	cd ..\error_tables
-	@echo Making in krb5\error_tables
-	$(MAKE) -$(MFLAGS)
-	cd ..\keytab
-	@echo Making in krb5\keytab
-	$(MAKE) -$(MFLAGS)
-	cd ..\krb
-	@echo Making in krb5\krb
-	$(MAKE) -$(MFLAGS)
-	cd ..\os
-	@echo Making in krb5\os
-	$(MAKE) -$(MFLAGS)
-	cd ..\posix
-	@echo Making in krb5\posix
-	$(MAKE) -$(MFLAGS)
-	cd ..\rcache
-	@echo Making in krb5\rcache
-	$(MAKE) -$(MFLAGS)
-	cd ..\unicode
-	@echo Making in krb5\unicode
-	$(MAKE) -$(MFLAGS)
-	cd ..
-
-clean-windows::
-	cd asn.1
-	@echo Making clean in krb5\asn.1
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\ccache
-	@echo Making clean in krb5\ccache
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\error_tables
-	@echo Making clean in krb5\error_tables
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\keytab
-	@echo Making clean in krb5\keytab
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\krb
-	@echo Making clean in krb5\krb
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\os
-	@echo Making clean in krb5\os
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\posix
-	@echo Making clean in krb5\posix
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\rcache
-	@echo Making clean in krb5\rcache
-	$(MAKE) -$(MFLAGS) clean
-	cd ..\unicode
-	@echo Making clean in krb5\unicode
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
-	@echo Making clean locally
-
 install-unix:: install-libs
 
 @lib_frag@
diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in
index d0566c120..ec8455ca6 100644
--- a/src/lib/krb5/asn.1/Makefile.in
+++ b/src/lib/krb5/asn.1/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/asn.1
+mydir=lib$(S)krb5$(S)asn.1
 BUILDTOP=$(REL)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index b421c031f..021bd7602 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/ccache
+mydir=lib$(S)krb5$(S)ccache
 BUILDTOP=$(REL)..$(S)..$(S)..
 SUBDIRS = # ccapi
 DEFS=
diff --git a/src/lib/krb5/ccache/ccapi/Makefile.in b/src/lib/krb5/ccache/ccapi/Makefile.in
index 135672b0c..7adfb208e 100644
--- a/src/lib/krb5/ccache/ccapi/Makefile.in
+++ b/src/lib/krb5/ccache/ccapi/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/ccache/ccapi
+mydir=lib$(S)krb5$(S)ccache$(S)ccapi
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = $(WIN_INCLUDES)
 DEFS= -DUSE_CCAPI -DUSE_CCAPI_V3
diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index d340b7b15..eb890d196 100644
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/error_tables
+mydir=lib$(S)krb5$(S)error_tables
 BUILDTOP=$(REL)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in
index 258eac7d3..ccb4a6a2a 100644
--- a/src/lib/krb5/keytab/Makefile.in
+++ b/src/lib/krb5/keytab/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/keytab
+mydir=lib$(S)krb5$(S)keytab
 BUILDTOP=$(REL)..$(S)..$(S)..
 DEFS=
 
diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in
index d4db454d4..b96229986 100644
--- a/src/lib/krb5/krb/Makefile.in
+++ b/src/lib/krb5/krb/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/krb
+mydir=lib$(S)krb5$(S)krb
 BUILDTOP=$(REL)..$(S)..$(S)..
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in
index dc9d09b1e..903d86af1 100644
--- a/src/lib/krb5/os/Makefile.in
+++ b/src/lib/krb5/os/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/os
+mydir=lib$(S)krb5$(S)os
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in
index fec270bc7..83e709670 100644
--- a/src/lib/krb5/rcache/Makefile.in
+++ b/src/lib/krb5/rcache/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/rcache
+mydir=lib$(S)krb5$(S)rcache
 BUILDTOP=$(REL)..$(S)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/lib/krb5/unicode/Makefile.in b/src/lib/krb5/unicode/Makefile.in
index 5ae89fbe7..63e08c9df 100644
--- a/src/lib/krb5/unicode/Makefile.in
+++ b/src/lib/krb5/unicode/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/krb5/unicode
+mydir=lib$(S)krb5$(S)unicode
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in
index 578a2d190..58de423bd 100644
--- a/src/lib/rpc/Makefile.in
+++ b/src/lib/rpc/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/rpc
+mydir=lib$(S)rpc
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0 -DGSSRPC__IMPL
 DEFS=
diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/unit-test/Makefile.in
index 71ddef8e0..0642e53de 100644
--- a/src/lib/rpc/unit-test/Makefile.in
+++ b/src/lib/rpc/unit-test/Makefile.in
@@ -1,4 +1,4 @@
-mydir=lib/rpc/unit-test
+mydir=lib$(S)rpc$(S)unit-test
 BUILDTOP=$(REL)..$(S)..$(S)..
 LOCALINCLUDES = -I.
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/plugins/authdata/greet/Makefile.in b/src/plugins/authdata/greet/Makefile.in
index 840ebc22d..6e3c0282e 100644
--- a/src/plugins/authdata/greet/Makefile.in
+++ b/src/plugins/authdata/greet/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/authdata/greet
+mydir=plugins$(S)authdata$(S)greet
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/plugins/authdata/greet_client/Makefile.in b/src/plugins/authdata/greet_client/Makefile.in
index 52f2e7245..82b10ff07 100644
--- a/src/plugins/authdata/greet_client/Makefile.in
+++ b/src/plugins/authdata/greet_client/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/authdata/greet_client
+mydir=plugins$(S)authdata$(S)greet_client
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/plugins/authdata/greet_server/Makefile.in b/src/plugins/authdata/greet_server/Makefile.in
index 2793aafac..54ffe67dc 100644
--- a/src/plugins/authdata/greet_server/Makefile.in
+++ b/src/plugins/authdata/greet_server/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/authdata/greet_server
+mydir=plugins$(S)authdata$(S)greet_server
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/plugins/kadm5_hook/test/Makefile.in b/src/plugins/kadm5_hook/test/Makefile.in
index 883cd14e2..0b2a2ef31 100644
--- a/src/plugins/kadm5_hook/test/Makefile.in
+++ b/src/plugins/kadm5_hook/test/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/kadm5_hook/test
+mydir=plugins$(S)kadm5_hook$(S)test
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/plugins/kdb/db2/Makefile.in b/src/plugins/kdb/db2/Makefile.in
index db570d706..182d80208 100644
--- a/src/plugins/kdb/db2/Makefile.in
+++ b/src/plugins/kdb/db2/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2
+mydir=plugins$(S)kdb$(S)db2
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/plugins/kdb/db2/libdb2/Makefile.in b/src/plugins/kdb/db2/libdb2/Makefile.in
index 9faf05490..3cc5da939 100644
--- a/src/plugins/kdb/db2/libdb2/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2/libdb2
+mydir=plugins$(S)kdb$(S)db2$(S)libdb2
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 SUBDIRS=hash btree db mpool recno test
 
diff --git a/src/plugins/kdb/db2/libdb2/btree/Makefile.in b/src/plugins/kdb/db2/libdb2/btree/Makefile.in
index 29a3ba88e..aa72ee940 100644
--- a/src/plugins/kdb/db2/libdb2/btree/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/btree/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2/libdb2/btree
+mydir=plugins$(S)kdb$(S)db2$(S)libdb2$(S)btree
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=	bt_close.o bt_conv.o bt_debug.o bt_delete.o bt_get.o \
 		bt_open.o bt_overflow.o bt_page.o bt_put.o bt_search.o \
diff --git a/src/plugins/kdb/db2/libdb2/db/Makefile.in b/src/plugins/kdb/db2/libdb2/db/Makefile.in
index a1c1db4ae..3e1371327 100644
--- a/src/plugins/kdb/db2/libdb2/db/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/db/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2/libdb2/db
+mydir=plugins$(S)kdb$(S)db2$(S)libdb2$(S)db
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=db.o
 
diff --git a/src/plugins/kdb/db2/libdb2/hash/Makefile.in b/src/plugins/kdb/db2/libdb2/hash/Makefile.in
index 9fedc04f3..0031b6f95 100644
--- a/src/plugins/kdb/db2/libdb2/hash/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/hash/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2/libdb2/hash
+mydir=plugins$(S)kdb$(S)db2$(S)libdb2$(S)hash
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=	hash.o hash_bigkey.o hash_debug.o hash_func.o hash_log2.o \
 		hash_page.o hsearch.o dbm.o
diff --git a/src/plugins/kdb/db2/libdb2/mpool/Makefile.in b/src/plugins/kdb/db2/libdb2/mpool/Makefile.in
index c8340fc26..c891a73a9 100644
--- a/src/plugins/kdb/db2/libdb2/mpool/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/mpool/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2/libdb2/mpool
+mydir=plugins$(S)kdb$(S)db2$(S)libdb2$(S)mpool
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=mpool.o
 
diff --git a/src/plugins/kdb/db2/libdb2/recno/Makefile.in b/src/plugins/kdb/db2/libdb2/recno/Makefile.in
index 022dca4af..f13341364 100644
--- a/src/plugins/kdb/db2/libdb2/recno/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/recno/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2/libdb2/recno
+mydir=plugins$(S)kdb$(S)db2$(S)libdb2$(S)recno
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 STLIBOBJS=	rec_close.o rec_delete.o rec_get.o rec_open.o rec_put.o \
 		rec_search.o rec_seq.o rec_utils.o
diff --git a/src/plugins/kdb/db2/libdb2/test/Makefile.in b/src/plugins/kdb/db2/libdb2/test/Makefile.in
index 7e3485e40..854d50d36 100644
--- a/src/plugins/kdb/db2/libdb2/test/Makefile.in
+++ b/src/plugins/kdb/db2/libdb2/test/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/db2/libdb2/test
+mydir=plugins$(S)kdb$(S)db2$(S)libdb2$(S)test
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 
 FCTSH = @FCTSH@
diff --git a/src/plugins/kdb/hdb/Makefile.in b/src/plugins/kdb/hdb/Makefile.in
index fa1485272..03e1e9902 100644
--- a/src/plugins/kdb/hdb/Makefile.in
+++ b/src/plugins/kdb/hdb/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/hdb
+mydir=plugins$(S)kdb$(S)hdb
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/plugins/kdb/ldap/Makefile.in b/src/plugins/kdb/ldap/Makefile.in
index 437bcc49a..490c3ecfd 100644
--- a/src/plugins/kdb/ldap/Makefile.in
+++ b/src/plugins/kdb/ldap/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/ldap
+mydir=plugins$(S)kdb$(S)ldap
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/plugins/kdb/ldap/ldap_util/Makefile.in b/src/plugins/kdb/ldap/ldap_util/Makefile.in
index e269a46a7..33f3b157a 100644
--- a/src/plugins/kdb/ldap/ldap_util/Makefile.in
+++ b/src/plugins/kdb/ldap/ldap_util/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/ldap/ldap_util
+mydir=plugins$(S)kdb$(S)ldap$(S)ldap_util
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 DEFINES = -DKDB4_DISABLE
 DEFS=
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in b/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
index 956ab394e..cadc1bfe0 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
+++ b/src/plugins/kdb/ldap/libkdb_ldap/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/kdb/ldap/libkdb_ldap
+mydir=plugins$(S)kdb$(S)ldap$(S)libkdb_ldap
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/plugins/locate/python/Makefile.in b/src/plugins/locate/python/Makefile.in
index 790de8475..4ac0232e9 100644
--- a/src/plugins/locate/python/Makefile.in
+++ b/src/plugins/locate/python/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/locate/python
+mydir=plugins$(S)locate$(S)python
 BUILDTOP=$(REL)..$(S)..$(S)..
 
 LIBBASE=python
diff --git a/src/plugins/preauth/cksum_body/Makefile.in b/src/plugins/preauth/cksum_body/Makefile.in
index adad2cf85..82c5a7b04 100644
--- a/src/plugins/preauth/cksum_body/Makefile.in
+++ b/src/plugins/preauth/cksum_body/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/preauth/cksum_body
+mydir=plugins$(S)preauth$(S)cksum_body
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/plugins/preauth/encrypted_challenge/Makefile.in b/src/plugins/preauth/encrypted_challenge/Makefile.in
index 2e2f41612..963e4d4bb 100644
--- a/src/plugins/preauth/encrypted_challenge/Makefile.in
+++ b/src/plugins/preauth/encrypted_challenge/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/preauth/encrypted_challenge
+mydir=plugins$(S)preauth$(S)encrypted_challenge
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/plugins/preauth/pkinit/Makefile.in b/src/plugins/preauth/pkinit/Makefile.in
index 6f10cea12..73bf6c1d0 100644
--- a/src/plugins/preauth/pkinit/Makefile.in
+++ b/src/plugins/preauth/pkinit/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/preauth/pkinit
+mydir=plugins$(S)preauth$(S)pkinit
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/plugins/preauth/securid_sam2/Makefile.in b/src/plugins/preauth/securid_sam2/Makefile.in
index a9f14ced5..642897c9e 100644
--- a/src/plugins/preauth/securid_sam2/Makefile.in
+++ b/src/plugins/preauth/securid_sam2/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/preauth/securid_sam2
+mydir=plugins$(S)preauth$(S)securid_sam2
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/plugins/preauth/wpse/Makefile.in b/src/plugins/preauth/wpse/Makefile.in
index 8a9c9ac9d..ca6e87d71 100644
--- a/src/plugins/preauth/wpse/Makefile.in
+++ b/src/plugins/preauth/wpse/Makefile.in
@@ -1,4 +1,4 @@
-mydir=plugins/preauth/wpse
+mydir=plugins$(S)preauth$(S)wpse
 BUILDTOP=$(REL)..$(S)..$(S)..
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 KRB5_CONFIG_SETUP = KRB5_CONFIG=$(top_srcdir)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/tests/asn.1/Makefile.in b/src/tests/asn.1/Makefile.in
index 14585e3d6..3bb385840 100644
--- a/src/tests/asn.1/Makefile.in
+++ b/src/tests/asn.1/Makefile.in
@@ -1,4 +1,4 @@
-mydir=tests/asn.1
+mydir=tests$(S)asn.1
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in
index bacb5d29d..24870e941 100644
--- a/src/tests/create/Makefile.in
+++ b/src/tests/create/Makefile.in
@@ -1,4 +1,4 @@
-mydir=tests/create
+mydir=tests$(S)create
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/dejagnu/Makefile.in
index 1cb750986..85c7ab9d1 100644
--- a/src/tests/dejagnu/Makefile.in
+++ b/src/tests/dejagnu/Makefile.in
@@ -1,4 +1,4 @@
-mydir=tests/dejagnu
+mydir=tests$(S)dejagnu
 BUILDTOP=$(REL)..$(S)..
 RUNTEST = @RUNTEST@ $(DEJAFLAGS)
 RUNTESTFLAGS =
diff --git a/src/tests/gss-threads/Makefile.in b/src/tests/gss-threads/Makefile.in
index 917bd1ffb..598dcf409 100644
--- a/src/tests/gss-threads/Makefile.in
+++ b/src/tests/gss-threads/Makefile.in
@@ -1,6 +1,6 @@
 # Derived from appl/gss-sample, January 2005.
 
-mydir=tests/gss-threads
+mydir=tests$(S)gss-threads
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DUSE_AUTOCONF_H -DGSSAPI_V2
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/tests/gssapi/Makefile.in b/src/tests/gssapi/Makefile.in
index 4002d001e..a0e2e47d4 100644
--- a/src/tests/gssapi/Makefile.in
+++ b/src/tests/gssapi/Makefile.in
@@ -1,4 +1,4 @@
-mydir=tests/gssapi
+mydir=tests$(S)gssapi
 BUILDTOP=$(REL)..$(S)..
 DEFINES = -DUSE_AUTOCONF_H
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/tests/hammer/Makefile.in b/src/tests/hammer/Makefile.in
index 2321028ca..c9d551568 100644
--- a/src/tests/hammer/Makefile.in
+++ b/src/tests/hammer/Makefile.in
@@ -1,4 +1,4 @@
-mydir=tests/hammer
+mydir=tests$(S)hammer
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/tests/misc/Makefile.in b/src/tests/misc/Makefile.in
index 9e52f8811..5a4b329bc 100644
--- a/src/tests/misc/Makefile.in
+++ b/src/tests/misc/Makefile.in
@@ -1,4 +1,4 @@
-mydir=tests/misc
+mydir=tests$(S)misc
 BUILDTOP=$(REL)..$(S)..
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/tests/mkeystash_compat/Makefile.in b/src/tests/mkeystash_compat/Makefile.in
index 1785e108f..5c53d9e8a 100644
--- a/src/tests/mkeystash_compat/Makefile.in
+++ b/src/tests/mkeystash_compat/Makefile.in
@@ -1,4 +1,4 @@
-mydir=tests/mkeystash_compat
+mydir=tests$(S)mkeystash_compat
 BUILDTOP=$(REL)..$(S)..
 
 RUN_SETUP = @KRB5_RUN_ENV@ KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf
diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in
index 98b87d127..be761c8d5 100644
--- a/src/tests/resolve/Makefile.in
+++ b/src/tests/resolve/Makefile.in
@@ -1,4 +1,4 @@
-mydir=tests/resolve
+mydir=tests$(S)resolve
 BUILDTOP=$(REL)..$(S)..
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
diff --git a/src/tests/shlib/Makefile.in b/src/tests/shlib/Makefile.in
index e8a061586..d569cacd7 100644
--- a/src/tests/shlib/Makefile.in
+++ b/src/tests/shlib/Makefile.in
@@ -1,4 +1,4 @@
-mydir=tests/shlib
+mydir=tests$(S)shlib
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/tests/threads/Makefile.in b/src/tests/threads/Makefile.in
index 139972a2e..0cc4be78a 100644
--- a/src/tests/threads/Makefile.in
+++ b/src/tests/threads/Makefile.in
@@ -1,4 +1,4 @@
-mydir=tests/threads
+mydir=tests$(S)threads
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in
index d46bff035..084941802 100644
--- a/src/tests/verify/Makefile.in
+++ b/src/tests/verify/Makefile.in
@@ -1,4 +1,4 @@
-mydir=tests/verify
+mydir=tests$(S)verify
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index ec92828c4..cd9dc0e8d 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -1,12 +1,12 @@
 mydir=util
-##WIN32###Windows NMAKE doesn't like @ in make variable names, and on
-##WIN32### Windows we don't do the @FOO@ substitutions we do with UNIX
-##WIN32### configure scripts.  The set of subdirs to use is hard-coded
-##WIN32### below in the 'all-windows' target anyways, so just hide this.
+# Windows NMAKE doesn't like @ in make variable names, and on
+# Windows we don't do the @FOO@ substitutions we do with UNIX
+# configure scripts, so hide this.
 ##WIN32##!if 0
 SUBDIRS=support $(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \
 	profile send-pr
 ##WIN32##!endif
+WINSUBDIRS=windows support et profile
 BUILDTOP=$(REL)..
 
 MAYBE_ET_k5 = et
@@ -20,32 +20,6 @@ clean-unix::
 	$(RM) -r $(FAKEPREFIX)
 
 NO_OUTDIR=1
-all-windows::
-	@echo Making in util\windows
-	cd windows
-	$(MAKE) -$(MFLAGS)
-	@echo Making in util\support
-	cd ..\support
-	$(MAKE) -$(MFLAGS)
-	@echo Making in util\et
-	cd ..\et
-	$(MAKE) -$(MFLAGS) 
-	@echo Making in util\profile
-	cd ..\profile
-	$(MAKE) -$(MFLAGS) 
-	cd ..
-
-clean-windows::
-	@echo Making clean in util\windows
-	cd windows
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in util\et
-	cd ..\et
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in util\profile
-	cd ..\profile
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
 
 install::
 	@echo nothing to install in util
diff --git a/src/util/collected-client-lib/Makefile.in b/src/util/collected-client-lib/Makefile.in
index f23f1e5cb..1f7d31012 100644
--- a/src/util/collected-client-lib/Makefile.in
+++ b/src/util/collected-client-lib/Makefile.in
@@ -1,4 +1,4 @@
-mydir=util/collected-client-lib
+mydir=util$(S)collected-client-lib
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/collected-client-lib
 DEFS=
diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index e585fb3fc..8a5648c2d 100644
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -2,7 +2,7 @@ prefix=@prefix@
 bindir=@bindir@
 datadir=@datadir@
 mydatadir=$(datadir)/et
-mydir=util/et
+mydir=util$(S)et
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/et
 SED = sed
diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index b857d435c..326fd1967 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -1,4 +1,4 @@
-mydir=util/profile
+mydir=util$(S)profile
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH) -L.
 PROG_RPATH=$(KRB5_LIBDIR)$(TCL_RPATH)
diff --git a/src/util/send-pr/Makefile.in b/src/util/send-pr/Makefile.in
index 5ee5ae5d8..24d884feb 100644
--- a/src/util/send-pr/Makefile.in
+++ b/src/util/send-pr/Makefile.in
@@ -1,4 +1,4 @@
-mydir=util/send-pr
+mydir=util$(S)send-pr
 BUILDTOP=$(REL)..$(S)..
 #
 # Makefile for building a standalone send-pr.
diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in
index d13df4282..3f6fd84f9 100644
--- a/src/util/ss/Makefile.in
+++ b/src/util/ss/Makefile.in
@@ -1,4 +1,4 @@
-mydir=util/ss
+mydir=util$(S)ss
 BUILDTOP=$(REL)..$(S)..
 SED = sed
 DEFS=
diff --git a/src/util/support/Makefile.in b/src/util/support/Makefile.in
index 6c2be57bb..88520438f 100644
--- a/src/util/support/Makefile.in
+++ b/src/util/support/Makefile.in
@@ -1,4 +1,4 @@
-mydir=util/support
+mydir=util$(S)support
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/support
 DEFS=
diff --git a/src/windows/Makefile.in b/src/windows/Makefile.in
index 6447cf4c6..9cadd576d 100644
--- a/src/windows/Makefile.in
+++ b/src/windows/Makefile.in
@@ -1,51 +1,6 @@
 BUILDTOP=..
 NO_OUTPRE=1
-
-#
-# Makefile that recurses into cns subdirectory.
-#
-all-windows::
-	@echo Making in windows\lib
-	cd lib
-	$(MAKE) -$(MFLAGS)
-	@echo Making in windows\cns
-	cd ..\cns
-	$(MAKE) -$(MFLAGS)
-	@echo Making in windows\gss
-	cd ..\gss
-	$(MAKE) -$(MFLAGS)
-	@echo Making in windows\gina
-	cd ..\gina
-	$(MAKE) -$(MFLAGS)
-	@echo Making in windows\ms2mit
-	cd ..\ms2mit
-	$(MAKE) -$(MFLAGS)
-!if "$(KRB5_KFW_COMPILE)"=="1" 
-        @echo Making in windows\kfwlogon
-        cd ..\kfwlogon
-        $(MAKE) -$(MFLAGS) 
-!endif 
-	cd ..
-
-clean-windows::
-	@echo Making clean in windows\lib
-	cd lib
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in windows\cns
-	cd ..\cns
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in windows\gss
-	cd ..\gss
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in windows\gina
-	cd ..\gina
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in windows\ms2mit
-	cd ..\ms2mit
-	$(MAKE) -$(MFLAGS) clean
-!if "$(KRB5_KFW_COMPILE)"=="1" 
-        @echo Making clean in windows\kfwlogon
-        cd ..\kfwlogon
-        $(MAKE) -$(MFLAGS) clean 
-!endif 
-	cd ..
+!if "$(KRB5_KFW_COMPILE)"=="1"
+KFWLOGON= kfwlogon
+!endif
+SUBDIRS= lib cns gss gina ms2mit $(KFWLOGON)
-- 
2.26.2