Do win32 build in subdir

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

24 files changed, 132 insertions, 84 deletions

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index ccce05aec..9e5e9c60f 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:15:00 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 Tue Jan  5 00:06:02 1999  Tom Yu  <tlyu@mit.edu>
 
 	* make_checksum.c (krb5_c_make_checksum): Note the fact that we're
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index ced76b819..5717655e1 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -9,10 +9,10 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/enc_provider \
 	-I$(srcdir)/old -I$(srcdir)/raw -I$(srcdir)/dk
 
 ##DOSBUILDTOP = ..\..
-##DOSLIBNAME=crypto.lib
-##DOSOBJFILE=crypto.lst
-##DOSOBJFILELIST=@crypto.lst @des.lst @md4.lst @md5.lst @sha1.lst @crc32.lst @dk.lst @old.lst @raw.lst @enc_prov.lst @hash_pro.lst @kh_pro.lst
-##DOSOBJFILEDEP =crypto.lst des.lst md4.lst md5.lst sha1.lst crc32.lst dk.lst old.lst raw.lst enc_prov.lst hash_pro.lst kh_pro.lst
+##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
+##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
 
 MAC_SUBDIRS = crc32 des dk enc_provider hash_provider keyhash_provider \
 	md4 md5 old raw sha1
@@ -48,31 +48,31 @@ STLIBOBJS=\
 	verify_checksum.o
 
 OBJS=\
-	block_size.$(OBJEXT)		\
-	checksum_length.$(OBJEXT)	\
-	cksumtype_to_string.$(OBJEXT)	\
-	cksumtypes.$(OBJEXT)		\
-	coll_proof_cksum.$(OBJEXT)	\
-	decrypt.$(OBJEXT)		\
-	encrypt.$(OBJEXT)		\
-	encrypt_length.$(OBJEXT)	\
-	enctype_compare.$(OBJEXT)	\
-	enctype_to_string.$(OBJEXT)	\
-	etypes.$(OBJEXT)		\
-	hmac.$(OBJEXT)			\
-	keyed_cksum.$(OBJEXT)		\
-	keyed_checksum_types.$(OBJEXT)	\
-	make_checksum.$(OBJEXT)		\
-	make_random_key.$(OBJEXT)	\
-	nfold.$(OBJEXT)			\
-	old_api_glue.$(OBJEXT)		\
-	prng.$(OBJEXT)			\
-	string_to_cksumtype.$(OBJEXT)	\
-	string_to_enctype.$(OBJEXT)	\
-	string_to_key.$(OBJEXT)		\
-	valid_cksumtype.$(OBJEXT)	\
-	valid_enctype.$(OBJEXT)		\
-	verify_checksum.$(OBJEXT)
+	$(OUTPRE)block_size.$(OBJEXT)		\
+	$(OUTPRE)checksum_length.$(OBJEXT)	\
+	$(OUTPRE)cksumtype_to_string.$(OBJEXT)	\
+	$(OUTPRE)cksumtypes.$(OBJEXT)		\
+	$(OUTPRE)coll_proof_cksum.$(OBJEXT)	\
+	$(OUTPRE)decrypt.$(OBJEXT)		\
+	$(OUTPRE)encrypt.$(OBJEXT)		\
+	$(OUTPRE)encrypt_length.$(OBJEXT)	\
+	$(OUTPRE)enctype_compare.$(OBJEXT)	\
+	$(OUTPRE)enctype_to_string.$(OBJEXT)	\
+	$(OUTPRE)etypes.$(OBJEXT)		\
+	$(OUTPRE)hmac.$(OBJEXT)			\
+	$(OUTPRE)keyed_cksum.$(OBJEXT)		\
+	$(OUTPRE)keyed_checksum_types.$(OBJEXT)	\
+	$(OUTPRE)make_checksum.$(OBJEXT)	\
+	$(OUTPRE)make_random_key.$(OBJEXT)	\
+	$(OUTPRE)nfold.$(OBJEXT)		\
+	$(OUTPRE)old_api_glue.$(OBJEXT)		\
+	$(OUTPRE)prng.$(OBJEXT)			\
+	$(OUTPRE)string_to_cksumtype.$(OBJEXT)	\
+	$(OUTPRE)string_to_enctype.$(OBJEXT)	\
+	$(OUTPRE)string_to_key.$(OBJEXT)	\
+	$(OUTPRE)valid_cksumtype.$(OBJEXT)	\
+	$(OUTPRE)valid_enctype.$(OBJEXT)	\
+	$(OUTPRE)verify_checksum.$(OBJEXT)
 
 SRCS=\
 	$(subdir)/block_size.c		\
diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog
index 7ae63a628..850d845f3 100644
--- a/src/lib/crypto/crc32/ChangeLog
+++ b/src/lib/crypto/crc32/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:15:59 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Set the myfulldir and mydir variables (which are
diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in
index b9c3647e0..03dbc1519 100644
--- a/src/lib/crypto/crc32/Makefile.in
+++ b/src/lib/crypto/crc32/Makefile.in
@@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=crc32
-##DOS##OBJFILE=..\crc32.lst
+##DOS##OBJFILE=..\$(OUTPRE)crc32.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 PROG_LIBPATH=-L$(TOPLIBD)
@@ -16,7 +16,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf
 
 STLIBOBJS= crc32.o
 
-OBJS= crc32.$(OBJEXT) 
+OBJS= $(OUTPRE)crc32.$(OBJEXT) 
 
 SRCS= $(srcdir)/crc32.c
 
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 37e78a695..34ac883cc 100644
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:16:18 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Set the myfulldir and mydir variables (which are
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index 7702db231..3e25c4723 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=des
-##DOS##OBJFILE=..\des.lst
+##DOS##OBJFILE=..\$(OUTPRE)des.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 PROG_LIBPATH=-L$(TOPLIBD)
@@ -27,17 +27,17 @@ STLIBOBJS=\
 	string2key.o	\
 	weak_key.o
 
-OBJS=	afsstring2key.$(OBJEXT)	\
-	d3_cbc.$(OBJEXT)	\
-	d3_kysched.$(OBJEXT)	\
-	f_cbc.$(OBJEXT) 	\
-	f_cksum.$(OBJEXT)	\
-	f_parity.$(OBJEXT) 	\
-	f_sched.$(OBJEXT) 	\
-	f_tables.$(OBJEXT)	\
-	key_sched.$(OBJEXT)	\
-	string2key.$(OBJEXT)	\
-	weak_key.$(OBJEXT)
+OBJS=	$(OUTPRE)afsstring2key.$(OBJEXT)	\
+	$(OUTPRE)d3_cbc.$(OBJEXT)	\
+	$(OUTPRE)d3_kysched.$(OBJEXT)	\
+	$(OUTPRE)f_cbc.$(OBJEXT) 	\
+	$(OUTPRE)f_cksum.$(OBJEXT)	\
+	$(OUTPRE)f_parity.$(OBJEXT) 	\
+	$(OUTPRE)f_sched.$(OBJEXT) 	\
+	$(OUTPRE)f_tables.$(OBJEXT)	\
+	$(OUTPRE)key_sched.$(OBJEXT)	\
+	$(OUTPRE)string2key.$(OBJEXT)	\
+	$(OUTPRE)weak_key.$(OBJEXT)
 
 SRCS=	$(srcdir)/afsstring2key.c	\
 	$(srcdir)/d3_cbc.c	\
@@ -59,8 +59,8 @@ includes:: depend
 
 depend:: $(SRCS)
 
-TOBJS = key_sched.$(OBJEXT) f_sched.$(OBJEXT) f_cbc.$(OBJEXT) \
-	f_tables.$(OBJEXT) f_cksum.$(OBJEXT)
+TOBJS = $(OUTPRE)key_sched.$(OBJEXT) $(OUTPRE)f_sched.$(OBJEXT) $(OUTPRE)f_cbc.$(OBJEXT) \
+	$(OUTPRE)f_tables.$(OBJEXT) $(OUTPRE)f_cksum.$(OBJEXT)
 
 verify$(EXEEXT): t_verify.$(OBJEXT) $(TOBJS) f_parity.$(OBJEXT) \
 	$(COM_ERR_DEPLIB)
diff --git a/src/lib/crypto/dk/ChangeLog b/src/lib/crypto/dk/ChangeLog
index 7f3300a94..566ce30ea 100644
--- a/src/lib/crypto/dk/ChangeLog
+++ b/src/lib/crypto/dk/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:16:34 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 Tue Jan  5 00:09:13 1999  Tom Yu  <tlyu@mit.edu>
 
 	* dk.h: Add prototypes for krb5_marc_dk_*.
diff --git a/src/lib/crypto/dk/Makefile.in b/src/lib/crypto/dk/Makefile.in
index e389d5355..88c3ad31c 100644
--- a/src/lib/crypto/dk/Makefile.in
+++ b/src/lib/crypto/dk/Makefile.in
@@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/..
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=dk
-##DOS##OBJFILE=..\dk.lst
+##DOS##OBJFILE=..\$(OUTPRE)dk.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 PROG_LIBPATH=-L$(TOPLIBD)
@@ -22,11 +22,11 @@ STLIBOBJS=\
 	stringtokey.o
 
 OBJS=\
-	checksum.$(OBJEXT)	\
-	dk_decrypt.$(OBJEXT)	\
-	dk_encrypt.$(OBJEXT)	\
-	derive.$(OBJEXT)	\
-	stringtokey.$(OBJEXT)
+	$(OUTPRE)checksum.$(OBJEXT)	\
+	$(OUTPRE)dk_decrypt.$(OBJEXT)	\
+	$(OUTPRE)dk_encrypt.$(OBJEXT)	\
+	$(OUTPRE)derive.$(OBJEXT)	\
+	$(OUTPRE)stringtokey.$(OBJEXT)
 
 SRCS=\
 	$(srcdir)/checksum.c	\
diff --git a/src/lib/crypto/enc_provider/ChangeLog b/src/lib/crypto/enc_provider/ChangeLog
index 6462758ab..0a6e666da 100644
--- a/src/lib/crypto/enc_provider/ChangeLog
+++ b/src/lib/crypto/enc_provider/ChangeLog
@@ -1,3 +1,6 @@
+Mon May 10 15:16:54 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
 
 1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
diff --git a/src/lib/crypto/enc_provider/Makefile.in b/src/lib/crypto/enc_provider/Makefile.in
index f6e679578..f757bf66a 100644
--- a/src/lib/crypto/enc_provider/Makefile.in
+++ b/src/lib/crypto/enc_provider/Makefile.in
@@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=enc_provider
-##DOS##OBJFILE=..\enc_prov.lst
+##DOS##OBJFILE=..\$(OUTPRE)enc_prov.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 PROG_LIBPATH=-L$(TOPLIBD)
@@ -16,7 +16,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf
 
 STLIBOBJS= des.o des3.o
 
-OBJS= des.$(OBJEXT) des3.$(OBJEXT)
+OBJS= $(OUTPRE)des.$(OBJEXT) $(OUTPRE)des3.$(OBJEXT)
 
 SRCS= $(srcdir)/des.c $(srcdir)/des3.c
 
diff --git a/src/lib/crypto/hash_provider/ChangeLog b/src/lib/crypto/hash_provider/ChangeLog
index a8a4bda50..acdc4b0e7 100644
--- a/src/lib/crypto/hash_provider/ChangeLog
+++ b/src/lib/crypto/hash_provider/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:19:03 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Set the myfulldir and mydir variables (which are
diff --git a/src/lib/crypto/hash_provider/Makefile.in b/src/lib/crypto/hash_provider/Makefile.in
index 6c4646a8a..1b2c988c5 100644
--- a/src/lib/crypto/hash_provider/Makefile.in
+++ b/src/lib/crypto/hash_provider/Makefile.in
@@ -7,7 +7,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crc32 -I$(srcdir)/../md4 \
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=hash_provider
-##DOS##OBJFILE=..\hash_pro.lst
+##DOS##OBJFILE=..\$(OUTPRE)hash_pro.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 PROG_LIBPATH=-L$(TOPLIBD)
@@ -17,8 +17,8 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf
 
 STLIBOBJS= hash_crc32.o hash_md4.o hash_md5.o hash_sha1.o
 
-OBJS= hash_crc32.$(OBJEXT) hash_md4.$(OBJEXT) \
-	hash_md5.$(OBJEXT) hash_sha1.$(OBJEXT)
+OBJS= $(OUTPRE)hash_crc32.$(OBJEXT) $(OUTPRE)hash_md4.$(OBJEXT) \
+	$(OUTPRE)hash_md5.$(OBJEXT) $(OUTPRE)hash_sha1.$(OBJEXT)
 
 SRCS= $(srcdir)/hash_crc32.c $(srcdir)/hash_md4.c \
 	$(srcdir)/hash_md5.c $(srcdir)/hash_sha1.c
diff --git a/src/lib/crypto/keyhash_provider/ChangeLog b/src/lib/crypto/keyhash_provider/ChangeLog
index a8a4bda50..f1d25b37f 100644
--- a/src/lib/crypto/keyhash_provider/ChangeLog
+++ b/src/lib/crypto/keyhash_provider/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:19:24 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Set the myfulldir and mydir variables (which are
diff --git a/src/lib/crypto/keyhash_provider/Makefile.in b/src/lib/crypto/keyhash_provider/Makefile.in
index 26501092c..a9317a9b5 100644
--- a/src/lib/crypto/keyhash_provider/Makefile.in
+++ b/src/lib/crypto/keyhash_provider/Makefile.in
@@ -7,7 +7,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des -I$(srcdir)/../md4 \
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=keyhash_provider
-##DOS##OBJFILE=..\kh_pro.lst
+##DOS##OBJFILE=..\$(OUTPRE)kh_pro.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 PROG_LIBPATH=-L$(TOPLIBD)
@@ -17,7 +17,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf
 
 STLIBOBJS= descbc.o k5_md4des.o k5_md5des.o
 
-OBJS= descbc.$(OBJEXT) k5_md4des.$(OBJEXT) k5_md5des.$(OBJEXT)
+OBJS= $(OUTPRE)descbc.$(OBJEXT) $(OUTPRE)k5_md4des.$(OBJEXT) $(OUTPRE)k5_md5des.$(OBJEXT)
 
 SRCS= $(srcdir)/descbc.c $(srcdir)/k5_md4des.c $(srcdir)/k5_md5des.c
 
diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog
index 18d62e698..254ecd6a5 100644
--- a/src/lib/crypto/md4/ChangeLog
+++ b/src/lib/crypto/md4/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:19:48 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Set the myfulldir and mydir variables (which are
diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in
index 8f9a7bac8..ba212a73a 100644
--- a/src/lib/crypto/md4/Makefile.in
+++ b/src/lib/crypto/md4/Makefile.in
@@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS)  -I$(srcdir)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=md4
-##DOS##OBJFILE=..\md4.lst
+##DOS##OBJFILE=..\$(OUTPRE)md4.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 PROG_LIBPATH=-L$(TOPLIBD)
@@ -16,7 +16,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf
 
 STLIBOBJS= md4.o
 
-OBJS= md4.$(OBJEXT) 
+OBJS= $(OUTPRE)md4.$(OBJEXT) 
 
 SRCS= $(srcdir)/md4.c
 
@@ -37,18 +37,19 @@ t_mddriver.o: t_mddriver.c
 t_mddriver: t_mddriver.o md4.o
 	$(CC) $(CFLAGS) -o t_mddriver t_mddriver.o md4.o
 
-t_mddriver.exe:
-	$(CP) $(srcdir)\..\md5\t_mddriver.c t_mddriver.c
-	$(CC) -DMD=4 $(CFLAGS2) -o t_mddriver t_mddriver.c md4.c
-	$(RM) md4.obj
+$(OUTPRE)t_mddriver.obj: t_mddriver.c
+	$(CC) -DMD=4 $(CFLAGS) -Fo$@ -c $**
+
+$(OUTPRE)t_mddriver.exe: $(OUTPRE)t_mddriver.obj $(OUTPRE)md4.obj
+	link -out:$@ $**
 
 check-unix:: t_mddriver
 	$(RUN_SETUP) $(C)t_mddriver -x
 
-check-windows:: t_mddriver$(EXEEXT)
-	$(C)t_mddriver$(EXEEXT) -x
+check-windows:: $(OUTPRE)t_mddriver.exe
+	$(OUTPRE)$(C)t_mddriver.exe -x
 
 clean:: 
-	$(RM) t_mddriver$(EXEEXT) t_mddriver.$(OBJEXT) t_mddriver.c
+	$(RM) $(OUTPRE)t_mddriver$(EXEEXT) $(OUTPRE)t_mddriver.$(OBJEXT) t_mddriver.c
 
 clean-unix:: clean-libobjs
diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog
index c0a63c504..06698f7c5 100644
--- a/src/lib/crypto/md5/ChangeLog
+++ b/src/lib/crypto/md5/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:20:16 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Set the myfulldir and mydir variables (which are
diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in
index 24e2b5ff3..896de961e 100644
--- a/src/lib/crypto/md5/Makefile.in
+++ b/src/lib/crypto/md5/Makefile.in
@@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=md5
-##DOS##OBJFILE=..\md5.lst
+##DOS##OBJFILE=..\$(OUTPRE)md5.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 PROG_LIBPATH=-L$(TOPLIBD)
@@ -16,7 +16,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf
 
 STLIBOBJS= md5.o
 
-OBJS= md5.$(OBJEXT) 
+OBJS= $(OUTPRE)md5.$(OBJEXT) 
 
 SRCS= $(srcdir)/md5.c
 
@@ -31,16 +31,16 @@ depend:: $(SRCS)
 t_mddriver: t_mddriver.o md5.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o t_mddriver t_mddriver.o md5.o
 
-t_mddriver.exe:
-	$(CC) $(CFLAGS2) -o t_mddriver.exe t_mddriver.c md5.c
+$(OUTPRE)t_mddriver.exe: $(OUTPRE)t_mddriver.obj $(OUTPRE)md5.obj
+	link -out:$@ $**
 
 check-unix:: t_mddriver
 	$(RUN_SETUP) $(C)t_mddriver -x
 
-check-windows:: t_mddriver$(EXEEXT)
-	$(C)t_mddriver$(EXEEXT) -x
+check-windows:: $(OUTPRE)t_mddriver.exe
+	$(OUTPRE)$(C)t_mddriver.exe -x
 
 clean:: 
-	$(RM) t_mddriver$(EXEEXT) t_mddriver.$(OBJEXT)
+	$(RM) $(OUTPRE)t_mddriver$(EXEEXT) $(OUTPRE)t_mddriver.$(OBJEXT)
 
 clean-unix:: clean-libobjs
diff --git a/src/lib/crypto/old/ChangeLog b/src/lib/crypto/old/ChangeLog
index 699aaebaa..c3368c68d 100644
--- a/src/lib/crypto/old/ChangeLog
+++ b/src/lib/crypto/old/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:20:32 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 Wed Dec 16 16:14:02 1998  Tom Yu  <tlyu@mit.edu>
 
 	* old_decrypt.c (krb5_old_decrypt): Initialize the ivec to the key
diff --git a/src/lib/crypto/old/Makefile.in b/src/lib/crypto/old/Makefile.in
index afae6d9d8..f808ed66b 100644
--- a/src/lib/crypto/old/Makefile.in
+++ b/src/lib/crypto/old/Makefile.in
@@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=old
-##DOS##OBJFILE=..\old.lst
+##DOS##OBJFILE=..\$(OUTPRE)old.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 PROG_LIBPATH=-L$(TOPLIBD)
@@ -16,7 +16,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf
 
 STLIBOBJS= des_stringtokey.o old_decrypt.o old_encrypt.o
 
-OBJS= des_stringtokey.$(OBJEXT) old_decrypt.$(OBJEXT) old_encrypt.$(OBJEXT)
+OBJS= $(OUTPRE)des_stringtokey.$(OBJEXT) $(OUTPRE)old_decrypt.$(OBJEXT) $(OUTPRE)old_encrypt.$(OBJEXT)
 
 SRCS= $(srcdir)/des_stringtokey.c $(srcdir)/old_decrypt.c \
 	$(srcdir)/old_encrypt.c
diff --git a/src/lib/crypto/raw/ChangeLog b/src/lib/crypto/raw/ChangeLog
index a8a4bda50..f8f2244e9 100644
--- a/src/lib/crypto/raw/ChangeLog
+++ b/src/lib/crypto/raw/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:20:51 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Set the myfulldir and mydir variables (which are
diff --git a/src/lib/crypto/raw/Makefile.in b/src/lib/crypto/raw/Makefile.in
index 879190192..427bb6b4e 100644
--- a/src/lib/crypto/raw/Makefile.in
+++ b/src/lib/crypto/raw/Makefile.in
@@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=raw
-##DOS##OBJFILE=..\raw.lst
+##DOS##OBJFILE=..\$(OUTPRE)raw.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 PROG_LIBPATH=-L$(TOPLIBD)
@@ -16,7 +16,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf
 
 STLIBOBJS= raw_decrypt.o raw_encrypt.o
 
-OBJS= raw_decrypt.$(OBJEXT) raw_encrypt.$(OBJEXT)
+OBJS= $(OUTPRE)raw_decrypt.$(OBJEXT) $(OUTPRE)raw_encrypt.$(OBJEXT)
 
 SRCS= $(srcdir)/raw_decrypt.c $(srcdir)/raw_encrypt.c
 
diff --git a/src/lib/crypto/sha1/ChangeLog b/src/lib/crypto/sha1/ChangeLog
index a8a4bda50..426acc040 100644
--- a/src/lib/crypto/sha1/ChangeLog
+++ b/src/lib/crypto/sha1/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 15:21:10 1999  Danilo Almeida  <dalmeida@mit.edu>
+
+	* Makefile.in: Do win32 build in subdir.
+
 1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Set the myfulldir and mydir variables (which are
diff --git a/src/lib/crypto/sha1/Makefile.in b/src/lib/crypto/sha1/Makefile.in
index 9c173ac88..2f8cea108 100644
--- a/src/lib/crypto/sha1/Makefile.in
+++ b/src/lib/crypto/sha1/Makefile.in
@@ -6,7 +6,7 @@ CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
 ##DOS##PREFIXDIR=sha1
-##DOS##OBJFILE=..\sha1.lst
+##DOS##OBJFILE=..\$(OUTPRE)sha1.lst
 ##WIN16##LIBNAME=..\crypto.lib
 
 PROG_LIBPATH=-L$(TOPLIBD)
@@ -16,7 +16,7 @@ RUN_SETUP = @KRB5_RUN_ENV@ KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf
 
 STLIBOBJS= shs.o
 
-OBJS= shs.$(OBJEXT) 
+OBJS= $(OUTPRE)shs.$(OBJEXT) 
 
 SRCS= $(srcdir)/shs.c
 
@@ -31,14 +31,14 @@ depend:: $(SRCS)
 t_shs: t_shs.o shs.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o t_shs t_shs.o shs.o
 
-t_shs.exe:
-	$(CC) $(CFLAGS2) -o t_shs.exe t_shs.c shs.c
+$(OUTPRE)t_shs.exe: $(OUTPRE)t_shs.obj $(OUTPRE)shs.obj
+	link -out:$@ $**
 
 check-unix:: t_shs
 	$(C)t_shs -x
 
-check-windows:: t_shs$(EXEEXT)
-	$(C)t_shs$(EXEEXT) -x
+check-windows:: $(OUTPRE)t_shs.exe
+	$(OUTPRE)$(C)t_shs.exe -x
 
 clean:: 
 	$(RM) t_shs$(EXEEXT) t_shs.$(OBJEXT)