First cut for a very conservative source tree cleanup:

[openssl.git] / makefile.one

diff --git a/makefile.one b/makefile.one
index b0931e0d6f4915c927608c8f2092e021d621c52e..896e4bc691ed6a0d09fa930d41507d12ffedbb8c 100644 (file)
--- a/makefile.one
+++ b/makefile.one
@@ -14,6 +14,7 @@
 INSTALLTOP=/usr/local/ssl
 
 # Set your compiler options
+PLATFORM=
 CC=cc
 CFLAG=-O -DTERMIO
 APP_CFLAG=
@@ -31,12 +32,10 @@ SRC_D=.
 LINK=${CC}
 LFLAGS=${CFLAGS}
 
-BN_MULW_OBJ=
-BN_MULW_SRC=
+BN_ASM_OBJ=
+BN_ASM_SRC=
 DES_ENC_OBJ=
 DES_ENC_SRC=
-DES_CRYPT_OBJ=
-DES_CRYPT_SRC=
 BF_ENC_OBJ=
 BF_ENC_SRC=
 CAST_ENC_OBJ=
@@ -119,24 +118,25 @@ HEADER=$(INCL_D)/cryptlib.h \
        $(INCL_D)/bf_pi.h $(INCL_D)/bf_locl.h $(INCL_D)/cast_s.h \
        $(INCL_D)/cast_lcl.h $(INCL_D)/bn_lcl.h $(INCL_D)/bn_prime.h \
        $(INCL_D)/obj_dat.h $(INCL_D)/conf_lcl.h $(INCL_D)/ssl_locl.h \
-       $(INCL_D)/rsaref.h $(INCL_D)/apps.h $(INCL_D)/progs.h \
-       $(INCL_D)/s_apps.h $(INCL_D)/testdsa.h $(INCL_D)/testrsa.h
+       $(INCL_D)/apps.h $(INCL_D)/progs.h $(INCL_D)/s_apps.h \
+       $(INCL_D)/testdsa.h $(INCL_D)/testrsa.h
 
 EXHEADER=$(INC_D)/e_os.h \
-       $(INC_D)/crypto.h $(INC_D)/cryptall.h $(INC_D)/md2.h \
-       $(INC_D)/md5.h $(INC_D)/sha.h $(INC_D)/mdc2.h \
-       $(INC_D)/hmac.h $(INC_D)/ripemd.h $(INC_D)/des.h \
-       $(INC_D)/rc2.h $(INC_D)/rc4.h $(INC_D)/rc5.h \
-       $(INC_D)/idea.h $(INC_D)/blowfish.h $(INC_D)/cast.h \
-       $(INC_D)/bn.h $(INC_D)/rsa.h $(INC_D)/dsa.h \
-       $(INC_D)/dh.h $(INC_D)/buffer.h $(INC_D)/bio.h \
-       $(INC_D)/bss_file.c $(INC_D)/stack.h $(INC_D)/lhash.h \
-       $(INC_D)/rand.h $(INC_D)/err.h $(INC_D)/objects.h \
-       $(INC_D)/evp.h $(INC_D)/pem.h $(INC_D)/asn1.h \
-       $(INC_D)/asn1_mac.h $(INC_D)/x509.h $(INC_D)/x509_vfy.h \
-       $(INC_D)/conf.h $(INC_D)/txt_db.h $(INC_D)/pkcs7.h \
-       $(INC_D)/ssl.h $(INC_D)/ssl2.h $(INC_D)/ssl3.h \
-       $(INC_D)/ssl23.h $(INC_D)/tls1.h
+       $(INC_D)/crypto.h $(INC_D)/cryptall.h $(INC_D)/tmdiff.h \
+       $(INC_D)/md2.h $(INC_D)/md5.h $(INC_D)/sha.h \
+       $(INC_D)/mdc2.h $(INC_D)/hmac.h $(INC_D)/ripemd.h \
+       $(INC_D)/des.h $(INC_D)/rc2.h $(INC_D)/rc4.h \
+       $(INC_D)/rc5.h $(INC_D)/idea.h $(INC_D)/blowfish.h \
+       $(INC_D)/cast.h $(INC_D)/bn.h $(INC_D)/rsa.h \
+       $(INC_D)/dsa.h $(INC_D)/dh.h $(INC_D)/buffer.h \
+       $(INC_D)/bio.h $(INC_D)/bss_file.c $(INC_D)/stack.h \
+       $(INC_D)/lhash.h $(INC_D)/rand.h $(INC_D)/err.h \
+       $(INC_D)/objects.h $(INC_D)/evp.h $(INC_D)/pem.h \
+       $(INC_D)/asn1.h $(INC_D)/asn1_mac.h $(INC_D)/x509.h \
+       $(INC_D)/x509_vfy.h $(INC_D)/conf.h $(INC_D)/txt_db.h \
+       $(INC_D)/pkcs7.h $(INC_D)/comp.h $(INC_D)/ssl.h \
+       $(INC_D)/ssl2.h $(INC_D)/ssl3.h $(INC_D)/ssl23.h \
+       $(INC_D)/tls1.h $(INC_D)/rsaref.h
 
 T_OBJ=$(OBJ_D)/md2test.o \
        $(OBJ_D)/md5test.o $(OBJ_D)/shatest.o $(OBJ_D)/sha1test.o \
@@ -160,35 +160,35 @@ E_OBJ=$(OBJ_D)/verify.o \
 
 CRYPTOOBJ=$(OBJ_D)/cryptlib.o \
        $(OBJ_D)/mem.o $(OBJ_D)/cversion.o $(OBJ_D)/ex_data.o \
-       $(OBJ_D)/cpt_err.o $(OBJ_D)/md2_dgst.o $(OBJ_D)/md2_one.o \
-       $(OBJ_D)/md5_dgst.o $(OBJ_D)/md5_one.o $(OBJ_D)/sha_dgst.o \
-       $(OBJ_D)/sha1dgst.o $(OBJ_D)/sha_one.o $(OBJ_D)/sha1_one.o \
-       $(OBJ_D)/mdc2dgst.o $(OBJ_D)/mdc2_one.o $(OBJ_D)/hmac.o \
-       $(OBJ_D)/rmd_dgst.o $(OBJ_D)/rmd_one.o $(OBJ_D)/set_key.o \
-       $(OBJ_D)/ecb_enc.o $(OBJ_D)/cbc_enc.o $(OBJ_D)/ecb3_enc.o \
-       $(OBJ_D)/cfb64enc.o $(OBJ_D)/cfb64ede.o $(OBJ_D)/cfb_enc.o \
-       $(OBJ_D)/ofb64ede.o $(OBJ_D)/enc_read.o $(OBJ_D)/enc_writ.o \
-       $(OBJ_D)/ofb64enc.o $(OBJ_D)/ofb_enc.o $(OBJ_D)/str2key.o \
-       $(OBJ_D)/pcbc_enc.o $(OBJ_D)/qud_cksm.o $(OBJ_D)/rand_key.o \
-       $(OBJ_D)/des_enc.o $(OBJ_D)/fcrypt_b.o $(OBJ_D)/read2pwd.o \
-       $(OBJ_D)/fcrypt.o $(OBJ_D)/xcbc_enc.o $(OBJ_D)/read_pwd.o \
-       $(OBJ_D)/rpc_enc.o $(OBJ_D)/cbc_cksm.o $(OBJ_D)/supp.o \
-       $(OBJ_D)/rc2_ecb.o $(OBJ_D)/rc2_skey.o $(OBJ_D)/rc2_cbc.o \
-       $(OBJ_D)/rc2cfb64.o $(OBJ_D)/rc2ofb64.o $(OBJ_D)/rc4_skey.o \
-       $(OBJ_D)/rc4_enc.o $(OBJ_D)/rc5_skey.o $(OBJ_D)/rc5_ecb.o \
-       $(OBJ_D)/rc5_enc.o $(OBJ_D)/rc5cfb64.o $(OBJ_D)/rc5ofb64.o \
-       $(OBJ_D)/i_cbc.o $(OBJ_D)/i_cfb64.o $(OBJ_D)/i_ofb64.o \
-       $(OBJ_D)/i_ecb.o $(OBJ_D)/i_skey.o $(OBJ_D)/bf_skey.o \
-       $(OBJ_D)/bf_ecb.o $(OBJ_D)/bf_enc.o $(OBJ_D)/bf_cfb64.o \
-       $(OBJ_D)/bf_ofb64.o $(OBJ_D)/c_skey.o $(OBJ_D)/c_ecb.o \
-       $(OBJ_D)/c_enc.o $(OBJ_D)/c_cfb64.o $(OBJ_D)/c_ofb64.o \
-       $(OBJ_D)/bn_add.o $(OBJ_D)/bn_div.o $(OBJ_D)/bn_exp.o \
-       $(OBJ_D)/bn_lib.o $(OBJ_D)/bn_mod.o $(OBJ_D)/bn_mul.o \
+       $(OBJ_D)/tmdiff.o $(OBJ_D)/cpt_err.o $(OBJ_D)/md2_dgst.o \
+       $(OBJ_D)/md2_one.o $(OBJ_D)/md5_dgst.o $(OBJ_D)/md5_one.o \
+       $(OBJ_D)/sha_dgst.o $(OBJ_D)/sha1dgst.o $(OBJ_D)/sha_one.o \
+       $(OBJ_D)/sha1_one.o $(OBJ_D)/mdc2dgst.o $(OBJ_D)/mdc2_one.o \
+       $(OBJ_D)/hmac.o $(OBJ_D)/rmd_dgst.o $(OBJ_D)/rmd_one.o \
+       $(OBJ_D)/set_key.o $(OBJ_D)/ecb_enc.o $(OBJ_D)/cbc_enc.o \
+       $(OBJ_D)/ecb3_enc.o $(OBJ_D)/cfb64enc.o $(OBJ_D)/cfb64ede.o \
+       $(OBJ_D)/cfb_enc.o $(OBJ_D)/ofb64ede.o $(OBJ_D)/enc_read.o \
+       $(OBJ_D)/enc_writ.o $(OBJ_D)/ofb64enc.o $(OBJ_D)/ofb_enc.o \
+       $(OBJ_D)/str2key.o $(OBJ_D)/pcbc_enc.o $(OBJ_D)/qud_cksm.o \
+       $(OBJ_D)/rand_key.o $(OBJ_D)/des_enc.o $(OBJ_D)/fcrypt_b.o \
+       $(OBJ_D)/read2pwd.o $(OBJ_D)/fcrypt.o $(OBJ_D)/xcbc_enc.o \
+       $(OBJ_D)/read_pwd.o $(OBJ_D)/rpc_enc.o $(OBJ_D)/cbc_cksm.o \
+       $(OBJ_D)/supp.o $(OBJ_D)/rc2_ecb.o $(OBJ_D)/rc2_skey.o \
+       $(OBJ_D)/rc2_cbc.o $(OBJ_D)/rc2cfb64.o $(OBJ_D)/rc2ofb64.o \
+       $(OBJ_D)/rc4_skey.o $(OBJ_D)/rc4_enc.o $(OBJ_D)/rc5_skey.o \
+       $(OBJ_D)/rc5_ecb.o $(OBJ_D)/rc5_enc.o $(OBJ_D)/rc5cfb64.o \
+       $(OBJ_D)/rc5ofb64.o $(OBJ_D)/i_cbc.o $(OBJ_D)/i_cfb64.o \
+       $(OBJ_D)/i_ofb64.o $(OBJ_D)/i_ecb.o $(OBJ_D)/i_skey.o \
+       $(OBJ_D)/bf_skey.o $(OBJ_D)/bf_ecb.o $(OBJ_D)/bf_enc.o \
+       $(OBJ_D)/bf_cfb64.o $(OBJ_D)/bf_ofb64.o $(OBJ_D)/c_skey.o \
+       $(OBJ_D)/c_ecb.o $(OBJ_D)/c_enc.o $(OBJ_D)/c_cfb64.o \
+       $(OBJ_D)/c_ofb64.o $(OBJ_D)/bn_add.o $(OBJ_D)/bn_div.o \
+       $(OBJ_D)/bn_exp.o $(OBJ_D)/bn_lib.o $(OBJ_D)/bn_mul.o \
        $(OBJ_D)/bn_print.o $(OBJ_D)/bn_rand.o $(OBJ_D)/bn_shift.o \
-       $(OBJ_D)/bn_sub.o $(OBJ_D)/bn_word.o $(OBJ_D)/bn_blind.o \
-       $(OBJ_D)/bn_gcd.o $(OBJ_D)/bn_prime.o $(OBJ_D)/bn_err.o \
-       $(OBJ_D)/bn_sqr.o $(OBJ_D)/bn_mulw.o $(OBJ_D)/bn_recp.o \
-       $(OBJ_D)/bn_mont.o $(OBJ_D)/bn_mpi.o $(OBJ_D)/rsa_eay.o \
+       $(OBJ_D)/bn_word.o $(OBJ_D)/bn_blind.o $(OBJ_D)/bn_gcd.o \
+       $(OBJ_D)/bn_prime.o $(OBJ_D)/bn_err.o $(OBJ_D)/bn_sqr.o \
+       $(OBJ_D)/bn_asm.o $(OBJ_D)/bn_recp.o $(OBJ_D)/bn_mont.o \
+       $(OBJ_D)/bn_mpi.o $(OBJ_D)/bn_exp2.o $(OBJ_D)/rsa_eay.o \
        $(OBJ_D)/rsa_gen.o $(OBJ_D)/rsa_lib.o $(OBJ_D)/rsa_sign.o \
        $(OBJ_D)/rsa_saos.o $(OBJ_D)/rsa_err.o $(OBJ_D)/rsa_pk1.o \
        $(OBJ_D)/rsa_ssl.o $(OBJ_D)/rsa_none.o $(OBJ_D)/dsa_gen.o \
@@ -203,33 +203,34 @@ CRYPTOOBJ=$(OBJ_D)/cryptlib.o \
        $(OBJ_D)/b_dump.o $(OBJ_D)/b_sock.o $(OBJ_D)/bss_acpt.o \
        $(OBJ_D)/bf_nbio.o $(OBJ_D)/stack.o $(OBJ_D)/lhash.o \
        $(OBJ_D)/lh_stats.o $(OBJ_D)/md_rand.o $(OBJ_D)/randfile.o \
-       $(OBJ_D)/err.o $(OBJ_D)/err_all.o $(OBJ_D)/err_prn.o \
-       $(OBJ_D)/obj_dat.o $(OBJ_D)/obj_lib.o $(OBJ_D)/obj_err.o \
-       $(OBJ_D)/encode.o $(OBJ_D)/digest.o $(OBJ_D)/evp_enc.o \
-       $(OBJ_D)/evp_key.o $(OBJ_D)/e_ecb_d.o $(OBJ_D)/e_cbc_d.o \
-       $(OBJ_D)/e_cfb_d.o $(OBJ_D)/e_ofb_d.o $(OBJ_D)/e_ecb_i.o \
-       $(OBJ_D)/e_cbc_i.o $(OBJ_D)/e_cfb_i.o $(OBJ_D)/e_ofb_i.o \
-       $(OBJ_D)/e_ecb_3d.o $(OBJ_D)/e_cbc_3d.o $(OBJ_D)/e_rc4.o \
-       $(OBJ_D)/names.o $(OBJ_D)/e_cfb_3d.o $(OBJ_D)/e_ofb_3d.o \
-       $(OBJ_D)/e_xcbc_d.o $(OBJ_D)/e_ecb_r2.o $(OBJ_D)/e_cbc_r2.o \
-       $(OBJ_D)/e_cfb_r2.o $(OBJ_D)/e_ofb_r2.o $(OBJ_D)/e_ecb_bf.o \
-       $(OBJ_D)/e_cbc_bf.o $(OBJ_D)/e_cfb_bf.o $(OBJ_D)/e_ofb_bf.o \
-       $(OBJ_D)/e_ecb_c.o $(OBJ_D)/e_cbc_c.o $(OBJ_D)/e_cfb_c.o \
-       $(OBJ_D)/e_ofb_c.o $(OBJ_D)/e_ecb_r5.o $(OBJ_D)/e_cbc_r5.o \
-       $(OBJ_D)/e_cfb_r5.o $(OBJ_D)/e_ofb_r5.o $(OBJ_D)/m_null.o \
-       $(OBJ_D)/m_md2.o $(OBJ_D)/m_md5.o $(OBJ_D)/m_sha.o \
-       $(OBJ_D)/m_sha1.o $(OBJ_D)/m_dss.o $(OBJ_D)/m_dss1.o \
-       $(OBJ_D)/m_mdc2.o $(OBJ_D)/m_ripemd.o $(OBJ_D)/p_open.o \
-       $(OBJ_D)/p_seal.o $(OBJ_D)/p_sign.o $(OBJ_D)/p_verify.o \
-       $(OBJ_D)/p_lib.o $(OBJ_D)/p_enc.o $(OBJ_D)/p_dec.o \
-       $(OBJ_D)/bio_md.o $(OBJ_D)/bio_b64.o $(OBJ_D)/bio_enc.o \
-       $(OBJ_D)/evp_err.o $(OBJ_D)/e_null.o $(OBJ_D)/c_all.o \
-       $(OBJ_D)/evp_lib.o $(OBJ_D)/pem_sign.o $(OBJ_D)/pem_seal.o \
-       $(OBJ_D)/pem_info.o $(OBJ_D)/pem_lib.o $(OBJ_D)/pem_all.o \
-       $(OBJ_D)/pem_err.o $(OBJ_D)/a_object.o $(OBJ_D)/a_bitstr.o \
-       $(OBJ_D)/a_utctm.o $(OBJ_D)/a_int.o $(OBJ_D)/a_octet.o \
-       $(OBJ_D)/a_print.o $(OBJ_D)/a_type.o $(OBJ_D)/a_set.o \
-       $(OBJ_D)/a_dup.o $(OBJ_D)/a_d2i_fp.o $(OBJ_D)/a_i2d_fp.o \
+       $(OBJ_D)/rand_lib.o $(OBJ_D)/err.o $(OBJ_D)/err_all.o \
+       $(OBJ_D)/err_prn.o $(OBJ_D)/o_names.o $(OBJ_D)/obj_dat.o \
+       $(OBJ_D)/obj_lib.o $(OBJ_D)/obj_err.o $(OBJ_D)/encode.o \
+       $(OBJ_D)/digest.o $(OBJ_D)/evp_enc.o $(OBJ_D)/evp_key.o \
+       $(OBJ_D)/e_ecb_d.o $(OBJ_D)/e_cbc_d.o $(OBJ_D)/e_cfb_d.o \
+       $(OBJ_D)/e_ofb_d.o $(OBJ_D)/e_ecb_i.o $(OBJ_D)/e_cbc_i.o \
+       $(OBJ_D)/e_cfb_i.o $(OBJ_D)/e_ofb_i.o $(OBJ_D)/e_ecb_3d.o \
+       $(OBJ_D)/e_cbc_3d.o $(OBJ_D)/e_rc4.o $(OBJ_D)/names.o \
+       $(OBJ_D)/e_cfb_3d.o $(OBJ_D)/e_ofb_3d.o $(OBJ_D)/e_xcbc_d.o \
+       $(OBJ_D)/e_ecb_r2.o $(OBJ_D)/e_cbc_r2.o $(OBJ_D)/e_cfb_r2.o \
+       $(OBJ_D)/e_ofb_r2.o $(OBJ_D)/e_ecb_bf.o $(OBJ_D)/e_cbc_bf.o \
+       $(OBJ_D)/e_cfb_bf.o $(OBJ_D)/e_ofb_bf.o $(OBJ_D)/e_ecb_c.o \
+       $(OBJ_D)/e_cbc_c.o $(OBJ_D)/e_cfb_c.o $(OBJ_D)/e_ofb_c.o \
+       $(OBJ_D)/e_ecb_r5.o $(OBJ_D)/e_cbc_r5.o $(OBJ_D)/e_cfb_r5.o \
+       $(OBJ_D)/e_ofb_r5.o $(OBJ_D)/m_null.o $(OBJ_D)/m_md2.o \
+       $(OBJ_D)/m_md5.o $(OBJ_D)/m_sha.o $(OBJ_D)/m_sha1.o \
+       $(OBJ_D)/m_dss.o $(OBJ_D)/m_dss1.o $(OBJ_D)/m_mdc2.o \
+       $(OBJ_D)/m_ripemd.o $(OBJ_D)/p_open.o $(OBJ_D)/p_seal.o \
+       $(OBJ_D)/p_sign.o $(OBJ_D)/p_verify.o $(OBJ_D)/p_lib.o \
+       $(OBJ_D)/p_enc.o $(OBJ_D)/p_dec.o $(OBJ_D)/bio_md.o \
+       $(OBJ_D)/bio_b64.o $(OBJ_D)/bio_enc.o $(OBJ_D)/evp_err.o \
+       $(OBJ_D)/e_null.o $(OBJ_D)/c_all.o $(OBJ_D)/evp_lib.o \
+       $(OBJ_D)/pem_sign.o $(OBJ_D)/pem_seal.o $(OBJ_D)/pem_info.o \
+       $(OBJ_D)/pem_lib.o $(OBJ_D)/pem_all.o $(OBJ_D)/pem_err.o \
+       $(OBJ_D)/a_object.o $(OBJ_D)/a_bitstr.o $(OBJ_D)/a_utctm.o \
+       $(OBJ_D)/a_int.o $(OBJ_D)/a_octet.o $(OBJ_D)/a_print.o \
+       $(OBJ_D)/a_type.o $(OBJ_D)/a_set.o $(OBJ_D)/a_dup.o \
+       $(OBJ_D)/a_d2i_fp.o $(OBJ_D)/a_i2d_fp.o $(OBJ_D)/a_bmp.o \
        $(OBJ_D)/a_sign.o $(OBJ_D)/a_digest.o $(OBJ_D)/a_verify.o \
        $(OBJ_D)/x_algor.o $(OBJ_D)/x_val.o $(OBJ_D)/x_pubkey.o \
        $(OBJ_D)/x_sig.o $(OBJ_D)/x_req.o $(OBJ_D)/x_attrib.o \
@@ -258,7 +259,8 @@ CRYPTOOBJ=$(OBJ_D)/cryptlib.o \
        $(OBJ_D)/by_file.o $(OBJ_D)/by_dir.o $(OBJ_D)/v3_net.o \
        $(OBJ_D)/v3_x509.o $(OBJ_D)/conf.o $(OBJ_D)/conf_err.o \
        $(OBJ_D)/txt_db.o $(OBJ_D)/pk7_lib.o $(OBJ_D)/pkcs7err.o \
-       $(OBJ_D)/pk7_doit.o
+       $(OBJ_D)/pk7_doit.o $(OBJ_D)/comp_lib.o $(OBJ_D)/c_rle.o \
+       $(OBJ_D)/c_zlib.o
 
 SSLOBJ=$(OBJ_D)/s2_meth.o \
        $(OBJ_D)/s2_srvr.o $(OBJ_D)/s2_clnt.o $(OBJ_D)/s2_lib.o \
@@ -405,9 +407,6 @@ $(INCL_D)/conf_lcl.h: $(SRC_D)/crypto/conf/conf_lcl.h
 $(INCL_D)/ssl_locl.h: $(SRC_D)/ssl/ssl_locl.h
        $(CP) $(SRC_D)/ssl/ssl_locl.h $(INCL_D)/ssl_locl.h
 
-$(INCL_D)/rsaref.h: $(SRC_D)/rsaref/rsaref.h
-       $(CP) $(SRC_D)/rsaref/rsaref.h $(INCL_D)/rsaref.h
-
 $(INCL_D)/apps.h: $(SRC_D)/apps/apps.h
        $(CP) $(SRC_D)/apps/apps.h $(INCL_D)/apps.h
 
@@ -432,6 +431,9 @@ $(INC_D)/crypto.h: $(SRC_D)/crypto/crypto.h
 $(INC_D)/cryptall.h: $(SRC_D)/crypto/cryptall.h
        $(CP) $(SRC_D)/crypto/cryptall.h $(INC_D)/cryptall.h
 
+$(INC_D)/tmdiff.h: $(SRC_D)/crypto/tmdiff.h
+       $(CP) $(SRC_D)/crypto/tmdiff.h $(INC_D)/tmdiff.h
+
 $(INC_D)/md2.h: $(SRC_D)/crypto/md2/md2.h
        $(CP) $(SRC_D)/crypto/md2/md2.h $(INC_D)/md2.h
 
@@ -534,6 +536,9 @@ $(INC_D)/txt_db.h: $(SRC_D)/crypto/txt_db/txt_db.h
 $(INC_D)/pkcs7.h: $(SRC_D)/crypto/pkcs7/pkcs7.h
        $(CP) $(SRC_D)/crypto/pkcs7/pkcs7.h $(INC_D)/pkcs7.h
 
+$(INC_D)/comp.h: $(SRC_D)/crypto/comp/comp.h
+       $(CP) $(SRC_D)/crypto/comp/comp.h $(INC_D)/comp.h
+
 $(INC_D)/ssl.h: $(SRC_D)/ssl/ssl.h
        $(CP) $(SRC_D)/ssl/ssl.h $(INC_D)/ssl.h
 
@@ -549,6 +554,9 @@ $(INC_D)/ssl23.h: $(SRC_D)/ssl/ssl23.h
 $(INC_D)/tls1.h: $(SRC_D)/ssl/tls1.h
        $(CP) $(SRC_D)/ssl/tls1.h $(INC_D)/tls1.h
 
+$(INC_D)/rsaref.h: $(SRC_D)/rsaref/rsaref.h
+       $(CP) $(SRC_D)/rsaref/rsaref.h $(INC_D)/rsaref.h
+
 $(OBJ_D)/md2test.o: $(SRC_D)/crypto/md2/md2test.c
        $(CC) -o $(OBJ_D)/md2test.o $(APP_CFLAGS) -c $(SRC_D)/crypto/md2/md2test.c
 
@@ -700,11 +708,14 @@ $(OBJ_D)/mem.o: $(SRC_D)/crypto/mem.c
        $(CC) -o $(OBJ_D)/mem.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/mem.c
 
 $(OBJ_D)/cversion.o: $(SRC_D)/crypto/cversion.c
-       $(CC) -o $(OBJ_D)/cversion.o  $(LIB_CFLAGS) -DCFLAGS="\"$(CC) $(CFLAG)\"" -c $(SRC_D)/crypto/cversion.c
+       $(CC) -o $(OBJ_D)/cversion.o  $(LIB_CFLAGS) -DCFLAGS="\"$(CC) $(CFLAG)\"" -DPLATFORM="\"$(PLATFORM)\"" -c $(SRC_D)/crypto/cversion.c
 
 $(OBJ_D)/ex_data.o: $(SRC_D)/crypto/ex_data.c
        $(CC) -o $(OBJ_D)/ex_data.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/ex_data.c
 
+$(OBJ_D)/tmdiff.o: $(SRC_D)/crypto/tmdiff.c
+       $(CC) -o $(OBJ_D)/tmdiff.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/tmdiff.c
+
 $(OBJ_D)/cpt_err.o: $(SRC_D)/crypto/cpt_err.c
        $(CC) -o $(OBJ_D)/cpt_err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/cpt_err.c
 
@@ -915,9 +926,6 @@ $(OBJ_D)/bn_exp.o: $(SRC_D)/crypto/bn/bn_exp.c
 $(OBJ_D)/bn_lib.o: $(SRC_D)/crypto/bn/bn_lib.c
        $(CC) -o $(OBJ_D)/bn_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_lib.c
 
-$(OBJ_D)/bn_mod.o: $(SRC_D)/crypto/bn/bn_mod.c
-       $(CC) -o $(OBJ_D)/bn_mod.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_mod.c
-
 $(OBJ_D)/bn_mul.o: $(SRC_D)/crypto/bn/bn_mul.c
        $(CC) -o $(OBJ_D)/bn_mul.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_mul.c
 
@@ -930,9 +938,6 @@ $(OBJ_D)/bn_rand.o: $(SRC_D)/crypto/bn/bn_rand.c
 $(OBJ_D)/bn_shift.o: $(SRC_D)/crypto/bn/bn_shift.c
        $(CC) -o $(OBJ_D)/bn_shift.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_shift.c
 
-$(OBJ_D)/bn_sub.o: $(SRC_D)/crypto/bn/bn_sub.c
-       $(CC) -o $(OBJ_D)/bn_sub.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_sub.c
-
 $(OBJ_D)/bn_word.o: $(SRC_D)/crypto/bn/bn_word.c
        $(CC) -o $(OBJ_D)/bn_word.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_word.c
 
@@ -951,8 +956,8 @@ $(OBJ_D)/bn_err.o: $(SRC_D)/crypto/bn/bn_err.c
 $(OBJ_D)/bn_sqr.o: $(SRC_D)/crypto/bn/bn_sqr.c
        $(CC) -o $(OBJ_D)/bn_sqr.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_sqr.c
 
-$(OBJ_D)/bn_mulw.o: $(SRC_D)/crypto/bn/bn_mulw.c
-       $(CC) -o $(OBJ_D)/bn_mulw.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_mulw.c
+$(OBJ_D)/bn_asm.o: $(SRC_D)/crypto/bn/bn_asm.c
+       $(CC) -o $(OBJ_D)/bn_asm.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_asm.c
 
 $(OBJ_D)/bn_recp.o: $(SRC_D)/crypto/bn/bn_recp.c
        $(CC) -o $(OBJ_D)/bn_recp.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_recp.c
@@ -963,6 +968,9 @@ $(OBJ_D)/bn_mont.o: $(SRC_D)/crypto/bn/bn_mont.c
 $(OBJ_D)/bn_mpi.o: $(SRC_D)/crypto/bn/bn_mpi.c
        $(CC) -o $(OBJ_D)/bn_mpi.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_mpi.c
 
+$(OBJ_D)/bn_exp2.o: $(SRC_D)/crypto/bn/bn_exp2.c
+       $(CC) -o $(OBJ_D)/bn_exp2.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/bn/bn_exp2.c
+
 $(OBJ_D)/rsa_eay.o: $(SRC_D)/crypto/rsa/rsa_eay.c
        $(CC) -o $(OBJ_D)/rsa_eay.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rsa/rsa_eay.c
 
@@ -1092,6 +1100,9 @@ $(OBJ_D)/md_rand.o: $(SRC_D)/crypto/rand/md_rand.c
 $(OBJ_D)/randfile.o: $(SRC_D)/crypto/rand/randfile.c
        $(CC) -o $(OBJ_D)/randfile.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rand/randfile.c
 
+$(OBJ_D)/rand_lib.o: $(SRC_D)/crypto/rand/rand_lib.c
+       $(CC) -o $(OBJ_D)/rand_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/rand/rand_lib.c
+
 $(OBJ_D)/err.o: $(SRC_D)/crypto/err/err.c
        $(CC) -o $(OBJ_D)/err.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/err/err.c
 
@@ -1101,6 +1112,9 @@ $(OBJ_D)/err_all.o: $(SRC_D)/crypto/err/err_all.c
 $(OBJ_D)/err_prn.o: $(SRC_D)/crypto/err/err_prn.c
        $(CC) -o $(OBJ_D)/err_prn.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/err/err_prn.c
 
+$(OBJ_D)/o_names.o: $(SRC_D)/crypto/objects/o_names.c
+       $(CC) -o $(OBJ_D)/o_names.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/objects/o_names.c
+
 $(OBJ_D)/obj_dat.o: $(SRC_D)/crypto/objects/obj_dat.c
        $(CC) -o $(OBJ_D)/obj_dat.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/objects/obj_dat.c
 
@@ -1335,6 +1349,9 @@ $(OBJ_D)/a_d2i_fp.o: $(SRC_D)/crypto/asn1/a_d2i_fp.c
 $(OBJ_D)/a_i2d_fp.o: $(SRC_D)/crypto/asn1/a_i2d_fp.c
        $(CC) -o $(OBJ_D)/a_i2d_fp.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_i2d_fp.c
 
+$(OBJ_D)/a_bmp.o: $(SRC_D)/crypto/asn1/a_bmp.c
+       $(CC) -o $(OBJ_D)/a_bmp.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_bmp.c
+
 $(OBJ_D)/a_sign.o: $(SRC_D)/crypto/asn1/a_sign.c
        $(CC) -o $(OBJ_D)/a_sign.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/asn1/a_sign.c
 
@@ -1590,6 +1607,15 @@ $(OBJ_D)/pkcs7err.o: $(SRC_D)/crypto/pkcs7/pkcs7err.c
 $(OBJ_D)/pk7_doit.o: $(SRC_D)/crypto/pkcs7/pk7_doit.c
        $(CC) -o $(OBJ_D)/pk7_doit.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/pkcs7/pk7_doit.c
 
+$(OBJ_D)/comp_lib.o: $(SRC_D)/crypto/comp/comp_lib.c
+       $(CC) -o $(OBJ_D)/comp_lib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/comp/comp_lib.c
+
+$(OBJ_D)/c_rle.o: $(SRC_D)/crypto/comp/c_rle.c
+       $(CC) -o $(OBJ_D)/c_rle.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/comp/c_rle.c
+
+$(OBJ_D)/c_zlib.o: $(SRC_D)/crypto/comp/c_zlib.c
+       $(CC) -o $(OBJ_D)/c_zlib.o  $(LIB_CFLAGS) -c $(SRC_D)/crypto/comp/c_zlib.c
+
 $(OBJ_D)/s2_meth.o: $(SRC_D)/ssl/s2_meth.c
        $(CC) -o $(OBJ_D)/s2_meth.o  $(LIB_CFLAGS) -c $(SRC_D)/ssl/s2_meth.c
 
@@ -1761,20 +1787,20 @@ $(TEST_D)/randtest: $(OBJ_D)/randtest.o $(LIBS_DEP)
 $(TEST_D)/ssltest: $(OBJ_D)/ssltest.o $(LIBS_DEP)
        $(LINK) -o $(TEST_D)/ssltest $(LFLAGS) $(OBJ_D)/ssltest.o $(L_LIBS) $(EX_LIBS)
 
-$(LIB_D)/$(O_SSL): $(SSLOBJ)
-       $(RM) $(LIB_D)/$(O_SSL)
-       $(MKLIB) $(LIB_D)/$(O_SSL) $(SSLOBJ)
-       $(RANLIB) $(LIB_D)/$(O_SSL)
+$(O_SSL): $(SSLOBJ)
+       $(RM) $(O_SSL)
+       $(MKLIB) $(O_SSL) $(SSLOBJ)
+       $(RANLIB) $(O_SSL)
 
-$(LIB_D)/$(O_RSAGLUE): $(RSAGLUEOBJ)
-       $(RM) $(LIB_D)/$(O_RSAGLUE)
-       $(MKLIB) $(LIB_D)/$(O_RSAGLUE) $(RSAGLUEOBJ)
-       $(RANLIB) $(LIB_D)/$(O_RSAGLUE)
+$(O_RSAGLUE): $(RSAGLUEOBJ)
+       $(RM) $(O_RSAGLUE)
+       $(MKLIB) $(O_RSAGLUE) $(RSAGLUEOBJ)
+       $(RANLIB) $(O_RSAGLUE)
 
-$(LIB_D)/$(O_CRYPTO): $(CRYPTOOBJ)
-       $(RM) $(LIB_D)/$(O_CRYPTO)
-       $(MKLIB) $(LIB_D)/$(O_CRYPTO) $(CRYPTOOBJ)
-       $(RANLIB) $(LIB_D)/$(O_CRYPTO)
+$(O_CRYPTO): $(CRYPTOOBJ)
+       $(RM) $(O_CRYPTO)
+       $(MKLIB) $(O_CRYPTO) $(CRYPTOOBJ)
+       $(RANLIB) $(O_CRYPTO)
 
 $(BIN_D)/$(E_EXE): $(E_OBJ) $(LIBS_DEP)
        $(LINK) -o $(BIN_D)/$(E_EXE) $(LFLAGS) $(E_OBJ) $(L_LIBS) $(EX_LIBS)