summaryrefslogtreecommitdiffstats
path: root/src/lib/crypto/krb
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2010-10-05 19:44:26 +0000
committerGreg Hudson <ghudson@mit.edu>2010-10-05 19:44:26 +0000
commit7f0efd1d97b469c28152b3ec8f6aeba0023aadf4 (patch)
tree8e0856a66a6af74313ecaea3a28c02d27a610429 /src/lib/crypto/krb
parent3dc195f236af086832383f3fa5a874f18d02b52d (diff)
downloadkrb5-7f0efd1d97b469c28152b3ec8f6aeba0023aadf4.tar.gz
krb5-7f0efd1d97b469c28152b3ec8f6aeba0023aadf4.tar.xz
krb5-7f0efd1d97b469c28152b3ec8f6aeba0023aadf4.zip
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
Diffstat (limited to 'src/lib/crypto/krb')
-rw-r--r--src/lib/crypto/krb/Makefile.in3
-rw-r--r--src/lib/crypto/krb/prng/nss/Makefile.in2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/crypto/krb/Makefile.in b/src/lib/crypto/krb/Makefile.in
index c4bdd70d9..94b06c4ee 100644
--- 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 3f537e57e..66b089383 100644
--- 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)