diff options
author | Bodo Möller <bodo@openssl.org> | 1999-05-20 22:18:49 +0000 |
---|---|---|
committer | Bodo Möller <bodo@openssl.org> | 1999-05-20 22:18:49 +0000 |
commit | d6847aed108ca305559dea11241198351730490c (patch) | |
tree | ce7f0f115f350645f25f01ec57802b89fae7394a | |
parent | 17e3dd1c62e9aadcd908c55e650f70379d2d19e2 (diff) | |
download | openssl-d6847aed108ca305559dea11241198351730490c.tar.gz |
Add a kludge :-(
There were problems with putting e_os.h just into the top directory,
because the test programs are compiled within test/ in the "standard"
case in in their original directories in the makefile.one case;
and in the latter symlinks may not be available.
-rw-r--r-- | crypto/Makefile.ssl | 1 | ||||
-rw-r--r-- | crypto/asn1/Makefile.ssl | 108 | ||||
-rw-r--r-- | crypto/bio/Makefile.ssl | 76 | ||||
-rw-r--r-- | crypto/bn/Makefile.ssl | 97 | ||||
-rw-r--r-- | crypto/buffer/Makefile.ssl | 7 | ||||
-rw-r--r-- | crypto/cast/Makefile.ssl | 21 | ||||
-rw-r--r-- | crypto/cast/cast_lcl.h | 2 | ||||
-rw-r--r-- | crypto/conf/Makefile.ssl | 7 | ||||
-rw-r--r-- | crypto/dh/Makefile.ssl | 26 | ||||
-rw-r--r-- | crypto/dsa/Makefile.ssl | 28 | ||||
-rw-r--r-- | crypto/e_os.h | 4 | ||||
-rw-r--r-- | crypto/err/Makefile.ssl | 16 | ||||
-rw-r--r-- | crypto/lhash/Makefile.ssl | 5 | ||||
-rw-r--r-- | crypto/md2/Makefile.ssl | 8 | ||||
-rw-r--r-- | crypto/objects/Makefile.ssl | 20 | ||||
-rw-r--r-- | crypto/rand/Makefile.ssl | 11 | ||||
-rw-r--r-- | crypto/rand/md_rand.c | 2 | ||||
-rw-r--r-- | crypto/rand/randfile.c | 2 | ||||
-rw-r--r-- | crypto/rsa/Makefile.ssl | 45 | ||||
-rw-r--r-- | crypto/stack/Makefile.ssl | 7 | ||||
-rw-r--r-- | crypto/txt_db/Makefile.ssl | 9 |
21 files changed, 239 insertions, 263 deletions
diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl index 1fc3bd8e75..34715749d1 100644 --- a/crypto/Makefile.ssl +++ b/crypto/Makefile.ssl @@ -73,7 +73,6 @@ links: @$(PERL) $(TOP)/util/mklink.pl ../test $(TEST) @$(PERL) $(TOP)/util/mklink.pl ../apps $(APPS) @$(TOP)/util/point.sh Makefile.ssl Makefile - @$(TOP)/util/point.sh ../e_os.h e_os.h @for i in $(SDIRS); do \ (cd $$i; echo "making links in crypto/$$i..."; \ $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PERL='${PERL}' links ); \ diff --git a/crypto/asn1/Makefile.ssl b/crypto/asn1/Makefile.ssl index f5211bc447..14e2cc8bae 100644 --- a/crypto/asn1/Makefile.ssl +++ b/crypto/asn1/Makefile.ssl @@ -117,22 +117,22 @@ clean: a_bitstr.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h a_bitstr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_bitstr.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_bitstr.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +a_bitstr.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +a_bitstr.o: ../../include/openssl/opensslconf.h a_bitstr.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h a_bitstr.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h a_bmp.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h a_bmp.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_bmp.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_bmp.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -a_bmp.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h -a_bmp.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +a_bmp.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +a_bmp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +a_bmp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +a_bmp.o: ../cryptlib.h ../e_os.h a_bool.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h a_bool.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_bool.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_bool.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -a_bool.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h -a_bool.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +a_bool.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +a_bool.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +a_bool.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +a_bool.o: ../cryptlib.h ../e_os.h a_bytes.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h a_bytes.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h a_bytes.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h @@ -203,16 +203,16 @@ a_dup.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h a_dup.o: ../cryptlib.h ../e_os.h a_enum.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h a_enum.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_enum.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_enum.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -a_enum.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h -a_enum.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +a_enum.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +a_enum.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +a_enum.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +a_enum.o: ../cryptlib.h ../e_os.h a_gentm.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h a_gentm.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_gentm.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_gentm.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -a_gentm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h -a_gentm.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +a_gentm.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +a_gentm.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +a_gentm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +a_gentm.o: ../cryptlib.h ../e_os.h a_hdr.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h a_hdr.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h a_hdr.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h @@ -249,10 +249,10 @@ a_i2d_fp.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h a_i2d_fp.o: ../cryptlib.h ../e_os.h a_int.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h a_int.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_int.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_int.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -a_int.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h -a_int.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +a_int.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +a_int.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +a_int.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +a_int.o: ../cryptlib.h ../e_os.h a_meth.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h a_meth.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h a_meth.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h @@ -271,23 +271,22 @@ a_meth.o: ../../include/openssl/stack.h ../../include/openssl/x509.h a_meth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ../e_os.h a_object.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h a_object.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_object.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_object.o: ../../include/openssl/err.h ../../include/openssl/objects.h -a_object.o: ../../include/openssl/opensslconf.h +a_object.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +a_object.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h a_object.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h a_object.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h a_octet.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h a_octet.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_octet.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_octet.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -a_octet.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h -a_octet.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +a_octet.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +a_octet.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +a_octet.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +a_octet.o: ../cryptlib.h ../e_os.h a_print.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h a_print.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_print.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_print.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -a_print.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h -a_print.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +a_print.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +a_print.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +a_print.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +a_print.o: ../cryptlib.h ../e_os.h a_set.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h a_set.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h a_set.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h @@ -323,10 +322,10 @@ a_sign.o: ../../include/openssl/stack.h ../../include/openssl/x509.h a_sign.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ../e_os.h a_time.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h a_time.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_time.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_time.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -a_time.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h -a_time.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +a_time.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +a_time.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +a_time.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +a_time.o: ../cryptlib.h ../e_os.h a_type.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h a_type.o: ../../include/openssl/bio.h ../../include/openssl/blowfish.h a_type.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h @@ -346,16 +345,16 @@ a_type.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h a_type.o: ../cryptlib.h ../e_os.h a_utctm.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h a_utctm.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_utctm.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_utctm.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -a_utctm.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h -a_utctm.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +a_utctm.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +a_utctm.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +a_utctm.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +a_utctm.o: ../cryptlib.h ../e_os.h a_utf8.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h a_utf8.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_utf8.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_utf8.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -a_utf8.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h -a_utf8.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +a_utf8.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +a_utf8.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +a_utf8.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +a_utf8.o: ../cryptlib.h ../e_os.h a_verify.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h a_verify.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h a_verify.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h @@ -375,10 +374,10 @@ a_verify.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h a_verify.o: ../cryptlib.h ../e_os.h a_vis.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h a_vis.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -a_vis.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -a_vis.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -a_vis.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h -a_vis.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +a_vis.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +a_vis.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +a_vis.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +a_vis.o: ../cryptlib.h ../e_os.h asn1_err.o: ../../include/openssl/asn1.h ../../include/openssl/bn.h asn1_err.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h asn1_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h @@ -418,8 +417,8 @@ asn1_par.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h asn1_par.o: ../cryptlib.h ../e_os.h asn_pack.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h asn_pack.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -asn_pack.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -asn_pack.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +asn_pack.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +asn_pack.o: ../../include/openssl/opensslconf.h asn_pack.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h asn_pack.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h d2i_dhp.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h @@ -1028,10 +1027,9 @@ t_crl.o: ../cryptlib.h ../e_os.h t_pkey.o: ../../include/openssl/bio.h ../../include/openssl/bn.h t_pkey.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h t_pkey.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h -t_pkey.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -t_pkey.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -t_pkey.o: ../../include/openssl/rsa.h ../../include/openssl/stack.h -t_pkey.o: ../cryptlib.h ../e_os.h +t_pkey.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +t_pkey.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h +t_pkey.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h t_req.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h t_req.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h t_req.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h diff --git a/crypto/bio/Makefile.ssl b/crypto/bio/Makefile.ssl index fc6ae683cc..6fb9089ba6 100644 --- a/crypto/bio/Makefile.ssl +++ b/crypto/bio/Makefile.ssl @@ -87,20 +87,17 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. b_dump.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -b_dump.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -b_dump.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -b_dump.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h -b_dump.o: ../cryptlib.h ../e_os.h +b_dump.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +b_dump.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +b_dump.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h b_print.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -b_print.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -b_print.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -b_print.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h -b_print.o: ../cryptlib.h ../e_os.h +b_print.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +b_print.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +b_print.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h b_sock.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -b_sock.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -b_sock.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -b_sock.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h -b_sock.o: ../cryptlib.h ../e_os.h +b_sock.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +b_sock.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +b_sock.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bf_buff.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h bf_buff.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h bf_buff.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h @@ -147,55 +144,50 @@ bf_null.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h bf_null.o: ../../include/openssl/sha.h ../../include/openssl/stack.h bf_null.o: ../cryptlib.h ../e_os.h bio_cb.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -bio_cb.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bio_cb.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -bio_cb.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h -bio_cb.o: ../cryptlib.h ../e_os.h +bio_cb.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +bio_cb.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +bio_cb.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bio_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h bio_err.o: ../../include/openssl/err.h ../../include/openssl/opensslv.h bio_err.o: ../../include/openssl/stack.h bio_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -bio_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bio_lib.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -bio_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h -bio_lib.o: ../cryptlib.h ../e_os.h +bio_lib.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +bio_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +bio_lib.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bss_acpt.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -bss_acpt.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bss_acpt.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bss_acpt.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +bss_acpt.o: ../../include/openssl/opensslconf.h bss_acpt.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h bss_acpt.o: ../cryptlib.h ../e_os.h bss_conn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -bss_conn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bss_conn.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bss_conn.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +bss_conn.o: ../../include/openssl/opensslconf.h bss_conn.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h bss_conn.o: ../cryptlib.h ../e_os.h bss_fd.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -bss_fd.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bss_fd.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -bss_fd.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h -bss_fd.o: ../cryptlib.h ../e_os.h bss_sock.c +bss_fd.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +bss_fd.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +bss_fd.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bss_sock.c bss_file.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -bss_file.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bss_file.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bss_file.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +bss_file.o: ../../include/openssl/opensslconf.h bss_file.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h bss_file.o: ../cryptlib.h ../e_os.h bss_log.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -bss_log.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bss_log.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -bss_log.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h -bss_log.o: ../cryptlib.h ../e_os.h +bss_log.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +bss_log.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +bss_log.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bss_mem.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -bss_mem.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bss_mem.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -bss_mem.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h -bss_mem.o: ../cryptlib.h ../e_os.h +bss_mem.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +bss_mem.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +bss_mem.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bss_null.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -bss_null.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bss_null.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bss_null.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +bss_null.o: ../../include/openssl/opensslconf.h bss_null.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h bss_null.o: ../cryptlib.h ../e_os.h bss_sock.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -bss_sock.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -bss_sock.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bss_sock.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +bss_sock.o: ../../include/openssl/opensslconf.h bss_sock.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h bss_sock.o: ../cryptlib.h ../e_os.h diff --git a/crypto/bn/Makefile.ssl b/crypto/bn/Makefile.ssl index 87ed18c7c5..6d72d1ccc6 100644 --- a/crypto/bn/Makefile.ssl +++ b/crypto/bn/Makefile.ssl @@ -162,99 +162,94 @@ clean: bn_add.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_add.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_add.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_add.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bn_add.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bn_lcl.h +bn_add.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bn_add.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +bn_add.o: ../cryptlib.h ../e_os.h bn_lcl.h bn_asm.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_asm.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_asm.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_asm.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bn_asm.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bn_lcl.h +bn_asm.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bn_asm.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +bn_asm.o: ../cryptlib.h ../e_os.h bn_lcl.h bn_blind.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_blind.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_blind.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_blind.o: ../../include/openssl/opensslconf.h +bn_blind.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h bn_blind.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h bn_blind.o: ../cryptlib.h ../e_os.h bn_lcl.h bn_div.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_div.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_div.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_div.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bn_div.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bn_lcl.h +bn_div.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bn_div.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +bn_div.o: ../cryptlib.h ../e_os.h bn_lcl.h bn_err.o: ../../include/openssl/bn.h ../../include/openssl/err.h bn_err.o: ../../include/openssl/opensslconf.h bn_exp.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_exp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_exp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_exp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bn_exp.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bn_lcl.h +bn_exp.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bn_exp.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +bn_exp.o: ../cryptlib.h ../e_os.h bn_lcl.h bn_exp2.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_exp2.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_exp2.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_exp2.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bn_exp2.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bn_lcl.h +bn_exp2.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bn_exp2.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +bn_exp2.o: ../cryptlib.h ../e_os.h bn_lcl.h bn_gcd.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_gcd.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_gcd.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_gcd.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bn_gcd.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bn_lcl.h +bn_gcd.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bn_gcd.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +bn_gcd.o: ../cryptlib.h ../e_os.h bn_lcl.h bn_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bn_lib.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bn_lcl.h +bn_lib.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bn_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +bn_lib.o: ../cryptlib.h ../e_os.h bn_lcl.h bn_mont.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_mont.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_mont.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_mont.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bn_mont.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bn_lcl.h +bn_mont.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bn_mont.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +bn_mont.o: ../cryptlib.h ../e_os.h bn_lcl.h bn_mpi.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_mpi.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_mpi.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_mpi.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bn_mpi.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bn_lcl.h +bn_mpi.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bn_mpi.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +bn_mpi.o: ../cryptlib.h ../e_os.h bn_lcl.h bn_mul.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_mul.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_mul.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_mul.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bn_mul.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bn_lcl.h +bn_mul.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bn_mul.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +bn_mul.o: ../cryptlib.h ../e_os.h bn_lcl.h bn_prime.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_prime.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_prime.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_prime.o: ../../include/openssl/opensslconf.h +bn_prime.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h bn_prime.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h bn_prime.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bn_lcl.h bn_prime.o: bn_prime.h bn_print.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_print.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_print.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_print.o: ../../include/openssl/opensslconf.h +bn_print.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h bn_print.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h bn_print.o: ../cryptlib.h ../e_os.h bn_lcl.h bn_rand.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_rand.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bn_rand.o: ../../include/openssl/rand.h ../../include/openssl/stack.h -bn_rand.o: ../cryptlib.h ../e_os.h bn_lcl.h +bn_rand.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bn_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h +bn_rand.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bn_lcl.h bn_recp.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_recp.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_recp.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_recp.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bn_recp.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bn_lcl.h +bn_recp.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bn_recp.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +bn_recp.o: ../cryptlib.h ../e_os.h bn_lcl.h bn_shift.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_shift.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_shift.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_shift.o: ../../include/openssl/opensslconf.h +bn_shift.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h bn_shift.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h bn_shift.o: ../cryptlib.h ../e_os.h bn_lcl.h bn_sqr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_sqr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_sqr.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_sqr.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bn_sqr.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bn_lcl.h +bn_sqr.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bn_sqr.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +bn_sqr.o: ../cryptlib.h ../e_os.h bn_lcl.h bn_word.o: ../../include/openssl/bio.h ../../include/openssl/bn.h bn_word.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -bn_word.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -bn_word.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -bn_word.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h bn_lcl.h +bn_word.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +bn_word.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +bn_word.o: ../cryptlib.h ../e_os.h bn_lcl.h diff --git a/crypto/buffer/Makefile.ssl b/crypto/buffer/Makefile.ssl index 67a1c22460..51c008feac 100644 --- a/crypto/buffer/Makefile.ssl +++ b/crypto/buffer/Makefile.ssl @@ -80,7 +80,6 @@ clean: buf_err.o: ../../include/openssl/buffer.h ../../include/openssl/err.h buffer.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -buffer.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -buffer.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -buffer.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h -buffer.o: ../cryptlib.h ../e_os.h +buffer.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +buffer.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +buffer.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h diff --git a/crypto/cast/Makefile.ssl b/crypto/cast/Makefile.ssl index 8c2f34cf43..d72f646b59 100644 --- a/crypto/cast/Makefile.ssl +++ b/crypto/cast/Makefile.ssl @@ -107,13 +107,14 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. -c_cfb64.o: ../../include/openssl/cast.h ../../include/openssl/e_os2.h ../e_os.h -c_cfb64.o: cast_lcl.h -c_ecb.o: ../../include/openssl/cast.h ../../include/openssl/e_os2.h -c_ecb.o: ../../include/openssl/opensslv.h ../e_os.h cast_lcl.h -c_enc.o: ../../include/openssl/cast.h ../../include/openssl/e_os2.h ../e_os.h -c_enc.o: cast_lcl.h -c_ofb64.o: ../../include/openssl/cast.h ../../include/openssl/e_os2.h ../e_os.h -c_ofb64.o: cast_lcl.h -c_skey.o: ../../include/openssl/cast.h ../../include/openssl/e_os2.h ../e_os.h -c_skey.o: cast_lcl.h cast_s.h +c_cfb64.o: ../../e_os.h ../../include/openssl/cast.h +c_cfb64.o: ../../include/openssl/e_os2.h cast_lcl.h +c_ecb.o: ../../e_os.h ../../include/openssl/cast.h +c_ecb.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslv.h +c_ecb.o: cast_lcl.h +c_enc.o: ../../e_os.h ../../include/openssl/cast.h +c_enc.o: ../../include/openssl/e_os2.h cast_lcl.h +c_ofb64.o: ../../e_os.h ../../include/openssl/cast.h +c_ofb64.o: ../../include/openssl/e_os2.h cast_lcl.h +c_skey.o: ../../e_os.h ../../include/openssl/cast.h +c_skey.o: ../../include/openssl/e_os2.h cast_lcl.h cast_s.h diff --git a/crypto/cast/cast_lcl.h b/crypto/cast/cast_lcl.h index 9f3a6602c9..98be7184f8 100644 --- a/crypto/cast/cast_lcl.h +++ b/crypto/cast/cast_lcl.h @@ -62,7 +62,7 @@ /* we need OPENSSL_EXTERN from e_os.h */ #ifndef FLAT_INC -# include "../e_os.h" +# include "../../e_os.h" #else # include "e_os.h" #endif diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile.ssl index 8654c892ff..6d93f32a6e 100644 --- a/crypto/conf/Makefile.ssl +++ b/crypto/conf/Makefile.ssl @@ -81,9 +81,8 @@ clean: conf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h conf.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h -conf.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -conf.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -conf.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h -conf.o: ../cryptlib.h ../e_os.h conf_lcl.h +conf.o: ../../include/openssl/err.h ../../include/openssl/lhash.h +conf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +conf.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h conf_lcl.h conf_err.o: ../../include/openssl/conf.h ../../include/openssl/err.h conf_err.o: ../../include/openssl/lhash.h ../../include/openssl/stack.h diff --git a/crypto/dh/Makefile.ssl b/crypto/dh/Makefile.ssl index 038aba1fa9..e47109f2d0 100644 --- a/crypto/dh/Makefile.ssl +++ b/crypto/dh/Makefile.ssl @@ -80,27 +80,25 @@ clean: dh_check.o: ../../include/openssl/bio.h ../../include/openssl/bn.h dh_check.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dh_check.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h -dh_check.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +dh_check.o: ../../include/openssl/dh.h ../../include/openssl/err.h +dh_check.o: ../../include/openssl/opensslconf.h dh_check.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h dh_check.o: ../cryptlib.h ../e_os.h dh_err.o: ../../include/openssl/bn.h ../../include/openssl/dh.h dh_err.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h dh_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h dh_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dh_gen.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h -dh_gen.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -dh_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h -dh_gen.o: ../cryptlib.h ../e_os.h +dh_gen.o: ../../include/openssl/dh.h ../../include/openssl/err.h +dh_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +dh_gen.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h dh_key.o: ../../include/openssl/bio.h ../../include/openssl/bn.h dh_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dh_key.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h -dh_key.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -dh_key.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h -dh_key.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +dh_key.o: ../../include/openssl/dh.h ../../include/openssl/err.h +dh_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +dh_key.o: ../../include/openssl/rand.h ../../include/openssl/stack.h +dh_key.o: ../cryptlib.h ../e_os.h dh_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h dh_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dh_lib.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h -dh_lib.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -dh_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h -dh_lib.o: ../cryptlib.h ../e_os.h +dh_lib.o: ../../include/openssl/dh.h ../../include/openssl/err.h +dh_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +dh_lib.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h diff --git a/crypto/dsa/Makefile.ssl b/crypto/dsa/Makefile.ssl index a19ab434bc..069ed5afe6 100644 --- a/crypto/dsa/Makefile.ssl +++ b/crypto/dsa/Makefile.ssl @@ -99,30 +99,26 @@ dsa_err.o: ../../include/openssl/bn.h ../../include/openssl/dsa.h dsa_err.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h dsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h dsa_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dsa_gen.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -dsa_gen.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -dsa_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h -dsa_gen.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -dsa_gen.o: ../cryptlib.h ../e_os.h +dsa_gen.o: ../../include/openssl/dsa.h ../../include/openssl/err.h +dsa_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +dsa_gen.o: ../../include/openssl/rand.h ../../include/openssl/sha.h +dsa_gen.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h dsa_key.o: ../../include/openssl/bio.h ../../include/openssl/bn.h dsa_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -dsa_key.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h -dsa_key.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -dsa_key.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h -dsa_key.o: ../../include/openssl/sha.h ../../include/openssl/stack.h -dsa_key.o: ../cryptlib.h ../e_os.h +dsa_key.o: ../../include/openssl/dsa.h ../../include/openssl/err.h +dsa_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +dsa_key.o: ../../include/openssl/rand.h ../../include/openssl/sha.h +dsa_key.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h dsa_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h dsa_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h dsa_lib.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h -dsa_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -dsa_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -dsa_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -dsa_lib.o: ../cryptlib.h ../e_os.h +dsa_lib.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +dsa_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h +dsa_lib.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h dsa_sign.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h dsa_sign.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h dsa_sign.o: ../../include/openssl/crypto.h ../../include/openssl/dsa.h -dsa_sign.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -dsa_sign.o: ../../include/openssl/opensslconf.h +dsa_sign.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h dsa_sign.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h dsa_sign.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h dsa_sign.o: ../cryptlib.h ../e_os.h diff --git a/crypto/e_os.h b/crypto/e_os.h new file mode 100644 index 0000000000..c834b54a1b --- /dev/null +++ b/crypto/e_os.h @@ -0,0 +1,4 @@ +/* The test programs are compiled in different directories for + * the "Makefile" and the "makefile.one" case -- the real e_os.h + * is one level above. */ +#include "../e_os.h" diff --git a/crypto/err/Makefile.ssl b/crypto/err/Makefile.ssl index 5c67c9648f..8a11d3ef56 100644 --- a/crypto/err/Makefile.ssl +++ b/crypto/err/Makefile.ssl @@ -79,10 +79,10 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. err.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -err.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -err.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +err.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h +err.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +err.o: ../cryptlib.h ../e_os.h err_all.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h err_all.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h err_all.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h @@ -102,7 +102,7 @@ err_all.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h err_all.o: ../../include/openssl/stack.h ../../include/openssl/x509.h err_all.o: ../../include/openssl/x509_vfy.h ../../include/openssl/x509v3.h err_prn.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -err_prn.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -err_prn.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -err_prn.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -err_prn.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +err_prn.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +err_prn.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h +err_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +err_prn.o: ../cryptlib.h ../e_os.h diff --git a/crypto/lhash/Makefile.ssl b/crypto/lhash/Makefile.ssl index 84df787f1a..902e53fa00 100644 --- a/crypto/lhash/Makefile.ssl +++ b/crypto/lhash/Makefile.ssl @@ -79,9 +79,8 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. lh_stats.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -lh_stats.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -lh_stats.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -lh_stats.o: ../../include/openssl/opensslconf.h +lh_stats.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +lh_stats.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h lh_stats.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h lh_stats.o: ../cryptlib.h ../e_os.h lhash.o: ../../include/openssl/crypto.h ../../include/openssl/lhash.h diff --git a/crypto/md2/Makefile.ssl b/crypto/md2/Makefile.ssl index 678123a322..5bc00cf3cc 100644 --- a/crypto/md2/Makefile.ssl +++ b/crypto/md2/Makefile.ssl @@ -81,7 +81,7 @@ clean: md2_dgst.o: ../../include/openssl/md2.h ../../include/openssl/opensslconf.h md2_dgst.o: ../../include/openssl/opensslv.h md2_one.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -md2_one.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -md2_one.o: ../../include/openssl/err.h ../../include/openssl/md2.h -md2_one.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -md2_one.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +md2_one.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +md2_one.o: ../../include/openssl/md2.h ../../include/openssl/opensslconf.h +md2_one.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +md2_one.o: ../cryptlib.h ../e_os.h diff --git a/crypto/objects/Makefile.ssl b/crypto/objects/Makefile.ssl index fa2a7b2bf4..cd0003304a 100644 --- a/crypto/objects/Makefile.ssl +++ b/crypto/objects/Makefile.ssl @@ -88,11 +88,11 @@ o_names.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h o_names.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h obj_dat.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h obj_dat.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -obj_dat.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -obj_dat.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -obj_dat.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -obj_dat.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h -obj_dat.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h obj_dat.h +obj_dat.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +obj_dat.o: ../../include/openssl/lhash.h ../../include/openssl/objects.h +obj_dat.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +obj_dat.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +obj_dat.o: ../cryptlib.h ../e_os.h obj_dat.h obj_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h obj_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h obj_err.o: ../../include/openssl/err.h ../../include/openssl/objects.h @@ -100,8 +100,8 @@ obj_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h obj_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h obj_lib.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h obj_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h -obj_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -obj_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -obj_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -obj_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h -obj_lib.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +obj_lib.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +obj_lib.o: ../../include/openssl/lhash.h ../../include/openssl/objects.h +obj_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +obj_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +obj_lib.o: ../cryptlib.h ../e_os.h diff --git a/crypto/rand/Makefile.ssl b/crypto/rand/Makefile.ssl index 6cf8bfbd7b..83eee8abd9 100644 --- a/crypto/rand/Makefile.ssl +++ b/crypto/rand/Makefile.ssl @@ -78,9 +78,10 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. -md_rand.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -md_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h -md_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h ../e_os.h +md_rand.o: ../../e_os.h ../../include/openssl/crypto.h +md_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslv.h +md_rand.o: ../../include/openssl/rand.h ../../include/openssl/sha.h +md_rand.o: ../../include/openssl/stack.h rand_lib.o: ../../include/openssl/rand.h -randfile.o: ../../include/openssl/e_os2.h ../../include/openssl/rand.h -randfile.o: ../e_os.h +randfile.o: ../../e_os.h ../../include/openssl/e_os2.h +randfile.o: ../../include/openssl/rand.h diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c index fdf0b70698..080581afcd 100644 --- a/crypto/rand/md_rand.c +++ b/crypto/rand/md_rand.c @@ -62,7 +62,7 @@ #include <string.h> #ifndef FLAT_INC -# include "../e_os.h" +# include "../../e_os.h" #else # include "e_os.h" #endif diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c index 8318df1c40..b91b5a2787 100644 --- a/crypto/rand/randfile.c +++ b/crypto/rand/randfile.c @@ -65,7 +65,7 @@ #include <sys/types.h> #ifndef FLAT_INC -# include "../e_os.h" +# include "../../e_os.h" #else # include "e_os.h" #endif diff --git a/crypto/rsa/Makefile.ssl b/crypto/rsa/Makefile.ssl index d8c1e7db4c..73b3b490a2 100644 --- a/crypto/rsa/Makefile.ssl +++ b/crypto/rsa/Makefile.ssl @@ -82,46 +82,43 @@ clean: rsa_eay.o: ../../include/openssl/bio.h ../../include/openssl/bn.h rsa_eay.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_eay.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_eay.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -rsa_eay.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h -rsa_eay.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +rsa_eay.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +rsa_eay.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h +rsa_eay.o: ../../include/openssl/rsa.h ../../include/openssl/stack.h +rsa_eay.o: ../cryptlib.h ../e_os.h rsa_err.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h rsa_err.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h rsa_err.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h rsa_err.o: ../../include/openssl/stack.h rsa_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h rsa_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -rsa_gen.o: ../../include/openssl/rsa.h ../../include/openssl/stack.h -rsa_gen.o: ../cryptlib.h ../e_os.h +rsa_gen.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +rsa_gen.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h +rsa_gen.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h rsa_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h rsa_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h -rsa_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/rsa.h -rsa_lib.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +rsa_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h +rsa_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +rsa_lib.o: ../../include/openssl/rsa.h ../../include/openssl/stack.h +rsa_lib.o: ../cryptlib.h ../e_os.h rsa_none.o: ../../include/openssl/bio.h ../../include/openssl/bn.h rsa_none.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_none.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_none.o: ../../include/openssl/opensslconf.h +rsa_none.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h rsa_none.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h rsa_none.o: ../../include/openssl/rsa.h ../../include/openssl/stack.h rsa_none.o: ../cryptlib.h ../e_os.h rsa_oaep.o: ../../include/openssl/bio.h ../../include/openssl/bn.h rsa_oaep.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_oaep.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_oaep.o: ../../include/openssl/opensslconf.h +rsa_oaep.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h rsa_oaep.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h rsa_oaep.o: ../../include/openssl/rsa.h ../../include/openssl/sha.h rsa_oaep.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h rsa_pk1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h rsa_pk1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_pk1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_pk1.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -rsa_pk1.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h -rsa_pk1.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +rsa_pk1.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +rsa_pk1.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h +rsa_pk1.o: ../../include/openssl/rsa.h ../../include/openssl/stack.h +rsa_pk1.o: ../cryptlib.h ../e_os.h rsa_saos.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h rsa_saos.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h rsa_saos.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h @@ -158,7 +155,7 @@ rsa_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h rsa_sign.o: ../cryptlib.h ../e_os.h rsa_ssl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h rsa_ssl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h -rsa_ssl.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h -rsa_ssl.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -rsa_ssl.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h -rsa_ssl.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h +rsa_ssl.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h +rsa_ssl.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h +rsa_ssl.o: ../../include/openssl/rsa.h ../../include/openssl/stack.h +rsa_ssl.o: ../cryptlib.h ../e_os.h diff --git a/crypto/stack/Makefile.ssl b/crypto/stack/Makefile.ssl index 3229ef77fb..65cecdbd33 100644 --- a/crypto/stack/Makefile.ssl +++ b/crypto/stack/Makefile.ssl @@ -79,7 +79,6 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. stack.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -stack.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -stack.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h -stack.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h -stack.o: ../cryptlib.h ../e_os.h +stack.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +stack.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h +stack.o: ../../include/openssl/stack.h ../cryptlib.h ../e_os.h diff --git a/crypto/txt_db/Makefile.ssl b/crypto/txt_db/Makefile.ssl index f9773a68ed..e0ea6d92b3 100644 --- a/crypto/txt_db/Makefile.ssl +++ b/crypto/txt_db/Makefile.ssl @@ -79,8 +79,7 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. txt_db.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h -txt_db.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -txt_db.o: ../../include/openssl/err.h ../../include/openssl/lhash.h -txt_db.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h -txt_db.o: ../../include/openssl/stack.h ../../include/openssl/txt_db.h -txt_db.o: ../cryptlib.h ../e_os.h +txt_db.o: ../../include/openssl/crypto.h ../../include/openssl/err.h +txt_db.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h +txt_db.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h +txt_db.o: ../../include/openssl/txt_db.h ../cryptlib.h ../e_os.h |