1 files changed, 32 insertions, 17 deletions
diff --git a/crypto/bio/Makefile b/crypto/bio/Makefile
index 5477ffb480..ff00c6e06f 100644
--- a/crypto/bio/Makefile
+++ b/crypto/bio/Makefile
@@ -76,14 +76,16 @@ b_dump.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 b_dump.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 b_dump.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 b_dump.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-b_dump.o: ../../include/openssl/symhacks.h ../cryptlib.h b_dump.c bio_lcl.h
+b_dump.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
+b_dump.o: b_dump.c bio_lcl.h
 b_print.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h
 b_print.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 b_print.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 b_print.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 b_print.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 b_print.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-b_print.o: ../../include/openssl/symhacks.h ../cryptlib.h b_print.c
+b_print.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
+b_print.o: b_print.c
 b_sock.o: ../../e_os.h ../../include/openssl/bio.h
 b_sock.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 b_sock.o: ../../include/openssl/dso.h ../../include/openssl/e_os2.h
@@ -91,14 +93,15 @@ b_sock.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
 b_sock.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
 b_sock.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
 b_sock.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-b_sock.o: ../cryptlib.h b_sock.c
+b_sock.o: ../include/internal/cryptlib.h b_sock.c
 bf_buff.o: ../../e_os.h ../../include/openssl/bio.h
 bf_buff.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bf_buff.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bf_buff.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bf_buff.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bf_buff.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bf_buff.o: ../../include/openssl/symhacks.h ../cryptlib.h bf_buff.c
+bf_buff.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
+bf_buff.o: bf_buff.c
 bf_nbio.o: ../../e_os.h ../../include/openssl/bio.h
 bf_nbio.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bf_nbio.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
@@ -106,21 +109,23 @@ bf_nbio.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bf_nbio.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bf_nbio.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
 bf_nbio.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-bf_nbio.o: ../cryptlib.h bf_nbio.c
+bf_nbio.o: ../include/internal/cryptlib.h bf_nbio.c
 bf_null.o: ../../e_os.h ../../include/openssl/bio.h
 bf_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bf_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bf_null.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bf_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bf_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bf_null.o: ../../include/openssl/symhacks.h ../cryptlib.h bf_null.c
+bf_null.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
+bf_null.o: bf_null.c
 bio_cb.o: ../../e_os.h ../../include/openssl/bio.h
 bio_cb.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bio_cb.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bio_cb.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bio_cb.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bio_cb.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bio_cb.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_cb.c
+bio_cb.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
+bio_cb.o: bio_cb.c
 bio_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 bio_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bio_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
@@ -133,14 +138,16 @@ bio_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bio_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bio_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bio_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bio_lib.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_lib.c
+bio_lib.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
+bio_lib.o: bio_lib.c
 bss_acpt.o: ../../e_os.h ../../include/openssl/bio.h
 bss_acpt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bss_acpt.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bss_acpt.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bss_acpt.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bss_acpt.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bss_acpt.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_acpt.c
+bss_acpt.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
+bss_acpt.o: bss_acpt.c
 bss_bio.o: ../../e_os.h ../../include/openssl/bio.h
 bss_bio.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
 bss_bio.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
@@ -154,53 +161,61 @@ bss_conn.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bss_conn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bss_conn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bss_conn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bss_conn.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_conn.c
+bss_conn.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
+bss_conn.o: bss_conn.c
 bss_dgram.o: ../../e_os.h ../../include/openssl/bio.h
 bss_dgram.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bss_dgram.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bss_dgram.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bss_dgram.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bss_dgram.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bss_dgram.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_dgram.c
+bss_dgram.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
+bss_dgram.o: bss_dgram.c
 bss_fd.o: ../../e_os.h ../../include/openssl/bio.h
 bss_fd.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bss_fd.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bss_fd.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bss_fd.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bss_fd.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bss_fd.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_lcl.h bss_fd.c
+bss_fd.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
+bss_fd.o: bio_lcl.h bss_fd.c
 bss_file.o: ../../e_os.h ../../include/openssl/bio.h
 bss_file.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bss_file.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bss_file.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bss_file.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bss_file.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bss_file.o: ../../include/openssl/symhacks.h ../cryptlib.h bio_lcl.h bss_file.c
+bss_file.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
+bss_file.o: bio_lcl.h bss_file.c
 bss_log.o: ../../e_os.h ../../include/openssl/bio.h
 bss_log.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bss_log.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bss_log.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bss_log.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bss_log.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bss_log.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_log.c
+bss_log.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
+bss_log.o: bss_log.c
 bss_mem.o: ../../e_os.h ../../include/openssl/bio.h
 bss_mem.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bss_mem.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bss_mem.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bss_mem.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bss_mem.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bss_mem.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_mem.c
+bss_mem.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
+bss_mem.o: bss_mem.c
 bss_null.o: ../../e_os.h ../../include/openssl/bio.h
 bss_null.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bss_null.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bss_null.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bss_null.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bss_null.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bss_null.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_null.c
+bss_null.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
+bss_null.o: bss_null.c
 bss_sock.o: ../../e_os.h ../../include/openssl/bio.h
 bss_sock.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
 bss_sock.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 bss_sock.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 bss_sock.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
 bss_sock.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
-bss_sock.o: ../../include/openssl/symhacks.h ../cryptlib.h bss_sock.c
+bss_sock.o: ../../include/openssl/symhacks.h ../include/internal/cryptlib.h
+bss_sock.o: bss_sock.c