Fix the NSS PRNG build. Fix the build for non-gmake make. Revert a

no longer necessary change to lib/crypto/krb/Makefile.in.

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

diff --git a/src/lib/crypto/crypto_tests/Makefile.in b/src/lib/crypto/crypto_tests/Makefile.in
index 62a80b2a274f6334402c780a134b12a9078215f2..40065f1fd51c7eb0629ffa0fe2e208fcd33c2bf9 100644 (file)
--- a/src/lib/crypto/crypto_tests/Makefile.in
+++ b/src/lib/crypto/crypto_tests/Makefile.in
@@ -57,13 +57,10 @@ check-unix:: t_nfold t_encrypt t_prf t_prng t_cmac t_hmac \
                t_crc t_cts t_short t_str2key t_camellia_ccm
        $(RUN_SETUP) $(VALGRIND) ./t_nfold
        $(RUN_SETUP) $(VALGRIND) ./t_encrypt
-ifeq ("@PRNG_ALG@","fortuna")
-               $(RUN_SETUP) $(VALGRIND) ./t_prng <$(srcdir)/t_prng.seed >t_prng.output
-else 
-       if [ @CRYPTO_IMPL@ != nss ]; then \
-               $(RUN_SETUP) $(VALGRIND) ./t_prng <$(srcdir)/t_prng.seed >t_prng.output && diff t_prng.output $(srcdir)/t_prng.expected; \
-       fi      
-endif
+       $(RUN_SETUP) $(VALGRIND) ./t_prng <$(srcdir)/t_prng.seed >t_prng.output
+       if [ @PRNG_ALG@ = yarrow ]; then \
+               diff t_prng.output $(srcdir)/t_prng.expected; \
+       fi
        $(RUN_SETUP) $(VALGRIND) ./t_cmac
        $(RUN_SETUP) $(VALGRIND) ./t_hmac
        $(RUN_SETUP) $(VALGRIND) ./t_prf <$(srcdir)/t_prf.in >t_prf.output

diff --git a/src/lib/crypto/krb/Makefile.in b/src/lib/crypto/krb/Makefile.in
index c4bdd70d91189b788d28a79ee7750c0856477dd7..94b06c4eeb95ee0dd3f698b50e4c2c1b988f085a 100644 (file)
--- a/src/lib/crypto/krb/Makefile.in
+++ b/src/lib/crypto/krb/Makefile.in
@@ -11,8 +11,7 @@ LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../@CRYPTO_IMPL@/enc_provider -I$(srcdir
                -I$(srcdir)/../@CRYPTO_IMPL@/ -I$(srcdir)/../@CRYPTO_IMPL@/des          \
                -I$(srcdir)/../@CRYPTO_IMPL@/aes -I$(srcdir)/arcfour    \
                -I$(srcdir)/../@CRYPTO_IMPL@/camellia \
-               -I$(srcdir)/../@CRYPTO_IMPL@/sha1 -I$(srcdir)/../@CRYPTO_IMPL@ \
-               @CRYPTO_IMPL_CFLAGS@
+               -I$(srcdir)/../@CRYPTO_IMPL@/sha1 -I$(srcdir)/../@CRYPTO_IMPL@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 DEFS=

diff --git a/src/lib/crypto/krb/prng/nss/Makefile.in b/src/lib/crypto/krb/prng/nss/Makefile.in
index 3f537e57edff1b98f4719d3258e03b0a5781b4a2..66b0893830ef93f498122a1d0a28dce13cd5ab21 100644 (file)
--- a/src/lib/crypto/krb/prng/nss/Makefile.in
+++ b/src/lib/crypto/krb/prng/nss/Makefile.in
@@ -1,7 +1,7 @@
 mydir=lib/crypto/krb/prng/nss
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \
-               -I$(srcdir)/../../../@CRYPTO_IMPL@
+               -I$(srcdir)/../../../@CRYPTO_IMPL@ @CRYPTO_IMPL_CFLAGS@
 DEFS=
 
 PROG_LIBPATH=-L$(TOPLIBD)