pull up r24469, r24530, r24533, r24534, r24535, r24537 from trunk

[krb5.git] / src / util / collected-client-lib / Makefile.in

diff --git a/src/util/collected-client-lib/Makefile.in b/src/util/collected-client-lib/Makefile.in
index bd8b5d3aba7d3d88951eb1d162bb6e167be21917..1f7d3101298d394248f3d610194cd37a73842701 100644 (file)
--- a/src/util/collected-client-lib/Makefile.in
+++ b/src/util/collected-client-lib/Makefile.in
@@ -1,6 +1,4 @@
-thisconfigdir=../..
-myfulldir=util/collected-client-lib
-mydir=util/collected-client-lib
+mydir=util$(S)collected-client-lib
 BUILDTOP=$(REL)..$(S)..
 RELDIR=../util/collected-client-lib
 DEFS=
@@ -41,21 +39,23 @@ STOBJLISTS= \
        ../../lib/krb5/unicode/OBJS.ST \
        ../profile/OBJS.ST \
        ../../lib/crypto/krb/crc32/OBJS.ST \
-       ../../lib/crypto/builtin/des/OBJS.ST \
+       ../../lib/crypto/@CRYPTO_IMPL@/des/OBJS.ST \
        ../../lib/crypto/krb/dk/OBJS.ST \
-       ../../lib/crypto/krb/enc_provider/OBJS.ST \
+       ../../lib/crypto/@CRYPTO_IMPL@/enc_provider/OBJS.ST \
        ../../lib/crypto/krb/hash_provider/OBJS.ST \
        ../../lib/crypto/krb/keyhash_provider/OBJS.ST \
-       ../../lib/crypto/builtin/md4/OBJS.ST \
-       ../../lib/crypto/builtin/md5/OBJS.ST \
+       ../../lib/crypto/@CRYPTO_IMPL@/md4/OBJS.ST \
+       ../../lib/crypto/@CRYPTO_IMPL@/md5/OBJS.ST \
        ../../lib/crypto/krb/old/OBJS.ST \
        ../../lib/crypto/krb/raw/OBJS.ST \
-       ../../lib/crypto/builtin/sha1/OBJS.ST \
-       ../../lib/crypto/builtin/arcfour/OBJS.ST \
-       ../../lib/crypto/builtin/aes/OBJS.ST \
-       ../../lib/crypto/krb/yarrow/OBJS.ST \
+       ../../lib/crypto/@CRYPTO_IMPL@/sha1/OBJS.ST \
+       ../../lib/crypto/@CRYPTO_IMPL@/arcfour/OBJS.ST \
+       ../../lib/crypto/@CRYPTO_IMPL@/aes/OBJS.ST \
+       ../../lib/crypto/@CRYPTO_IMPL@/camellia/OBJS.ST \
+       ../../lib/crypto/krb/prng/OBJS.ST \
+       ../../lib/crypto/krb/prng/@PRNG_ALG@/OBJS.ST \
        ../../lib/crypto/krb/OBJS.ST \
-       ../../lib/crypto/builtin/OBJS.ST \
+       ../../lib/crypto/@CRYPTO_IMPL@/OBJS.ST \
        ../../lib/crypto/OBJS.ST \
        ../et/OBJS.ST \
        ../support/OBJS.ST