13 files changed, 14 insertions, 130 deletions
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=