Fix up yarrow build on Windows

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

diff --git a/src/ChangeLog b/src/ChangeLog
index d6571cd8e9c5c5cd8221e7308c05b7fb2256d139..1907005031ffda1bd087572e7acf07a2b980901f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-19  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Fix up lib/crypto/yarrow for Windows.
+
 2001-11-16  Sam Hartman  <hartmans@mit.edu>
 
        * Makefile.in (FILES): Add lib/crypto/yarrow

diff --git a/src/Makefile.in b/src/Makefile.in
index e72df6d90054a094d866099fd26d5d7fedbe4305..af7d1c999a720bf32f2c197c7eff61f64c969a2e 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -138,7 +138,7 @@ WINMAKEFILES=Makefile \
        lib\crypto\raw\Makefile lib\crypto\old\Makefile \
        lib\crypto\sha1\Makefile lib\crypto\arcfour\Makefile \
        lib\crypto\md4\Makefile lib\crypto\md5\Makefile \
-lib\crypto\yarrow\Makefile \
+       lib\crypto\yarrow\Makefile \
        lib\des425\Makefile \
        lib\gssapi\Makefile lib\gssapi\generic\Makefile \
        lib\gssapi\krb5\Makefile lib\gssapi\mechglue\Makefile \
@@ -210,6 +210,8 @@ lib\crypto\yarrow\Makefile \
 ##DOS##        $(WCONFIG) config < $@.in > $@
 ##DOS##lib\crypto\md5\Makefile: lib\crypto\md5\Makefile.in $(MKFDEP)
 ##DOS##        $(WCONFIG) config < $@.in > $@
+##DOS##lib\crypto\yarrow\Makefile: lib\crypto\yarrow\Makefile.in $(MKFDEP)
+##DOS##        $(WCONFIG) config < $@.in > $@
 ##DOS##lib\crypto\old\Makefile: lib\crypto\old\Makefile.in $(MKFDEP)
 ##DOS##        $(WCONFIG) config < $@.in > $@
 ##DOS##lib\crypto\raw\Makefile: lib\crypto\raw\Makefile.in $(MKFDEP)
@@ -317,8 +319,8 @@ FILES= ./* \
        lib/crypto/* lib/crypto/crc32/* lib/crypto/des/* lib/crypto/dk/* \
        lib/crypto/enc_provider/* lib/crypto/hash_provider/* \
        lib/crypto/keyhash_provider/* lib/crypto/old/* lib/crypto/raw/* \
-       lib/crypto/sha1/* lib/crypto/arcfour/* lib/crypto/md4/* lib/crypto/md5/* \
-lib/crypto/yarrow/* \
+       lib/crypto/sha1/* lib/crypto/arcfour/* lib/crypto/md4/* \
+       lib/crypto/md5/* lib/crypto/yarrow/* \
        lib/des425/* lib/gssapi/* lib/gssapi/generic/* lib/gssapi/krb5/* \
        lib/gssapi/mechglue/* lib/krb4/* \
        lib/krb5/* lib/krb5/asn.1/* lib/krb5/krb/* \

diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index f83b2cae9f59a3f33360ebacd0065d0076bef14c..2e2bbbdb71e3a6a2d230cb73b29c4a6e410f4a75 100644 (file)
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-19  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Do yarrow subdir on Windows.
+       
 2001-11-19  Sam Hartman  <hartmans@mit.edu>
 
        * t_prng.c (main): Fix seeding bug in t_prng

diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index e6b85a825ea039f0126d9c184978e31fc563fb11..a3c96248b1e77f30076c159fc9d7fc9cc66e7f36 100644 (file)
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -15,7 +15,7 @@ PROG_RPATH=$(KRB5_LIBDIR)
 ##DOSBUILDTOP = ..\..
 ##DOSLIBNAME=$(OUTPRE)crypto.lib
 ##DOSOBJFILE=$(OUTPRE)crypto.lst
-##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst
+##DOSOBJFILELIST=@$(OUTPRE)crypto.lst @$(OUTPRE)des.lst @$(OUTPRE)md4.lst @$(OUTPRE)md5.lst @$(OUTPRE)sha1.lst @$(OUTPRE)arcfour.lst @$(OUTPRE)crc32.lst @$(OUTPRE)dk.lst @$(OUTPRE)old.lst @$(OUTPRE)raw.lst @$(OUTPRE)enc_prov.lst @$(OUTPRE)hash_pro.lst @$(OUTPRE)kh_pro.lst @$(OUTPRE)yarrow.lst
 ##DOSOBJFILEDEP =$(OUTPRE)crypto.lst $(OUTPRE)des.lst $(OUTPRE)md4.lst $(OUTPRE)md5.lst $(OUTPRE)sha1.lst $(OUTPRE)arcfour.lst $(OUTPRE)crc32.lst $(OUTPRE)dk.lst $(OUTPRE)old.lst $(OUTPRE)raw.lst $(OUTPRE)enc_prov.lst $(OUTPRE)hash_pro.lst $(OUTPRE)kh_pro.lst
 
 MAC_SUBDIRS = crc32 des dk enc_provider hash_provider keyhash_provider \
@@ -197,6 +197,9 @@ all-windows::
        cd ..\arcfour
        @echo Making in crypto\arcfour
        $(MAKE) -$(MFLAGS)
+       cd ..\yarrow
+       @echo Making in crypto\yarrow
+       $(MAKE) -$(MFLAGS)
        cd ..
 
 clean-windows::
@@ -236,6 +239,9 @@ clean-windows::
        cd ..\arcfour
        @echo Making clean in crypto\arcfour
        $(MAKE) -$(MFLAGS) clean
+       cd ..\yarrow
+       @echo Making clean in crypto\yarrow
+       $(MAKE) -$(MFLAGS) clean
        cd ..
 
 check-windows::
@@ -275,6 +281,9 @@ check-windows::
        cd ..\arcfour
        @echo Making check in crypto\arcfour
        $(MAKE) -$(MFLAGS) check
+       cd ..\yarrow
+       @echo Making check in crypto\yarrow
+       $(MAKE) -$(MFLAGS) check
        cd ..
 
 # +++ Dependency line eater +++

diff --git a/src/lib/crypto/yarrow/ChangeLog b/src/lib/crypto/yarrow/ChangeLog
index fdca6742eafb2c9981749b4f9ba2aef0eb72887b..cbdc2d216b118b9fb38a2196cfd3593aa808ba63 100644 (file)
--- a/src/lib/crypto/yarrow/ChangeLog
+++ b/src/lib/crypto/yarrow/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-19  Danilo Almeida  <dalmeida@mit.edu>
+
+       * Makefile.in: Fix typo OUTP -> OUTPRE.
+
 2001-11-14  Sam Hartman  <hartmans@mit.edu>
 
        * ycipher.c (krb5int_yarrow_cipher_init):  Use free not free_keyblock_contents

diff --git a/src/lib/crypto/yarrow/Makefile.in b/src/lib/crypto/yarrow/Makefile.in
index 49f8e9e8cb3a48dcaff9340e24c4e0568dfb7912..2bd85c0061fa30d71763763043e648cd3e087392 100644 (file)
--- a/src/lib/crypto/yarrow/Makefile.in
+++ b/src/lib/crypto/yarrow/Makefile.in
@@ -19,7 +19,7 @@ STLIBOBJS=\
        ycipher.o
 OBJS=\
        $(OUTPRE)yarrow.$(OBJEXT) \
-       $(OUTP)ycipher.$(OBJEXT)
+       $(OUTPRE)ycipher.$(OBJEXT)
 
 SRCS=\
        $(srcdir)/yarrow.c \