1 files changed, 1 insertions, 42 deletions

diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile
index 461954b13d..a9d00105f8 100644
--- a/src/lib/libssl/crypto/Makefile
+++ b/src/lib/libssl/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2002/09/26 11:39:50 markus Exp $
+# $OpenBSD: Makefile,v 1.29 2003/01/31 14:05:35 deraadt Exp $
 
 LIB=    crypto
 
@@ -35,21 +35,13 @@ CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
 CFLAGS+= -I${LCRYPTO_SRC}
 SRCS+= o_time.c
 SRCS+=  cryptlib.c ex_data.c cpt_err.c mem.c mem_dbg.c tmdiff.c cversion.c uid.c
-CFLAGS+= -I${LCRYPTO_SRC}/md2
 SRCS+=  md2_dgst.c md2_one.c                                    
-CFLAGS+= -I${LCRYPTO_SRC}/md5
 SRCS+=  md5_dgst.c md5_one.c                                    
-CFLAGS+= -I${LCRYPTO_SRC}/sha
 SRCS+=  sha_dgst.c sha1dgst.c sha_one.c sha1_one.c      
-#CFLAGS+= -I${LCRYPTO_SRC}/mdc2
 #SRCS+= mdc2dgst.c mdc2_one.c                                   
-CFLAGS+= -I${LCRYPTO_SRC}/hmac
 SRCS+=  hmac.c                                                  
-CFLAGS+= -I${LCRYPTO_SRC}/ripemd
 SRCS+=  rmd_dgst.c rmd_one.c                            
-CFLAGS+= -I${LCRYPTO_SRC}/aes
 SRCS+= aes_cbc.c aes_cfb.c aes_ctr.c aes_ecb.c aes_ofb.c aes_misc.c aes_core.c
-CFLAGS+= -I${LCRYPTO_SRC}/des
 SRCS+=  cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \
         ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c \
         ofb64enc.c ofb_enc.c pcbc_enc.c \
@@ -58,56 +50,38 @@ SRCS+=	cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \
         fcrypt.c xcbc_enc.c ede_cbcm_enc.c \
         str2key.c cfb64ede.c ofb64ede.c \
         des_old.c read2pwd.c
-CFLAGS+= -I${LCRYPTO_SRC}/rc2
 SRCS+=  rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c
 SRCS+=  rc2ofb64.c                                                      
-CFLAGS+= -I${LCRYPTO_SRC}/rc4
 SRCS+=  rc4_skey.c rc4_enc.c
-#CFLAGS+= -I${LCRYPTO_SRC}/rc5
 #SRCS+= rc5_skey.c rc5_ecb.c rc5cfb64.c rc5cfb64.c      
 #SRCS+= rc5ofb64.c rc5_enc.c
-#CFLAGS+= -I${LCRYPTO_SRC}/idea
 #SRCS+= i_cbc.c i_cfb64.c i_ofb64.c i_ecb.c             
 #SRCS+= i_skey.c                                                        
-CFLAGS+= -I${LCRYPTO_SRC}/bf
 SRCS+=  bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c bf_enc.c               
-CFLAGS+= -I${LCRYPTO_SRC}/cast
 SRCS+=  c_skey.c c_ecb.c c_cfb64.c c_ofb64.c c_enc.c    
-CFLAGS+= -I${LCRYPTO_SRC}/bn
 SRCS+=  bn_add.c bn_div.c bn_exp.c bn_lib.c
 SRCS+=  bn_mul.c bn_print.c bn_rand.c bn_shift.c
 SRCS+=  bn_word.c bn_blind.c bn_gcd.c bn_prime.c bn_err.c
 SRCS+=  bn_sqr.c bn_recp.c bn_mont.c bn_mpi.c bn_asm.c bn_mod.c
 SRCS+=  bn_exp2.c bn_ctx.c
 SRCS+=  bn_sqrt.c bn_kron.c
-CFLAGS+= -I${LCRYPTO_SRC}/rsa
 SRCS+=  rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c
 SRCS+=  rsa_saos.c rsa_err.c rsa_pk1.c rsa_ssl.c
 SRCS+=  rsa_none.c rsa_chk.c rsa_oaep.c rsa_null.c rsa_asn1.c
-CFLAGS+= -I${LCRYPTO_SRC}/dsa
 SRCS+=  dsa_gen.c dsa_key.c dsa_lib.c dsa_vrf.c         
 SRCS+=  dsa_sign.c dsa_err.c dsa_asn1.c dsa_ossl.c
-CFLAGS+= -I${LCRYPTO_SRC}/dh
 SRCS+=  dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_asn1.c
-CFLAGS+= -I${LCRYPTO_SRC}/buffer
 SRCS+=  buffer.c buf_err.c                              
-CFLAGS+= -I${LCRYPTO_SRC}/bio
 SRCS+=  bio_lib.c bio_cb.c bio_err.c bss_mem.c          
 SRCS+=  bss_null.c bss_fd.c bss_file.c bss_sock.c       
 SRCS+=  bss_conn.c bf_null.c bf_buff.c 
 SRCS+=  b_print.c b_dump.c b_sock.c bss_acpt.c          
 SRCS+=  bf_nbio.c bss_bio.c bss_log.c
-CFLAGS+= -I${LCRYPTO_SRC}/stack
 SRCS+=  stack.c                                                 
-CFLAGS+= -I${LCRYPTO_SRC}/lhash
 SRCS+=  lhash.c lh_stats.c                                      
-CFLAGS+= -I${LCRYPTO_SRC}/rand
 SRCS+=  md_rand.c randfile.c rand_lib.c rand_egd.c rand_err.c rand_unix.c
-CFLAGS+= -I${LCRYPTO_SRC}/err
 SRCS+=  err.c err_all.c err_prn.c                               
-CFLAGS+= -I${LCRYPTO_SRC}/objects
 SRCS+=  obj_dat.c obj_lib.c obj_err.c o_names.c
-CFLAGS+= -I${LCRYPTO_SRC}/evp
 SRCS+= bio_b64.c e_bf.c m_sha.c p_open.c
 SRCS+= bio_enc.c e_cast.c e_xcbc_d.c m_dss.c m_sha1.c p_seal.c
 SRCS+= bio_md.c e_des.c encode.c m_dss1.c names.c p_sign.c
@@ -117,14 +91,10 @@ SRCS+= c_allc.c evp_key.c m_md5.c p5_crpt2.c
 SRCS+= c_alld.c e_null.c evp_lib.c p_dec.c
 SRCS+= digest.c e_rc2.c evp_pbe.c m_null.c p_enc.c
 SRCS+= e_aes.c e_rc4.c evp_pkey.c m_ripemd.c p_lib.c
-CFLAGS+= -I${LCRYPTO_SRC}/md4
 SRCS+= md4_dgst.c md4_one.c
-CFLAGS+= -I${LCRYPTO_SRC}/pem
 SRCS+=  pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_pkey.c   
 SRCS+=  pem_all.c pem_err.c pem_x509.c pem_pk8.c pem_oth.c pem_xaux.c
-CFLAGS+= -I${LCRYPTO_SRC}/ui
 SRCS+=  ui_err.c ui_lib.c ui_openssl.c ui_compat.c ui_util.c
-CFLAGS+= -I${LCRYPTO_SRC}/asn1
 SRCS+= a_bitstr.c a_mbstr.c a_utctm.c f_enum.c t_bitst.c x_name.c
 SRCS+= a_bool.c a_meth.c a_utf8.c f_int.c t_crl.c tasn_typ.c x_pkey.c
 SRCS+= a_bytes.c a_object.c a_verify.c f_string.c t_pkey.c tasn_utl.c x_pubkey.c
@@ -136,45 +106,34 @@ SRCS+= a_gentm.c a_strex.c d2i_pr.c p5_pbe.c tasn_dec.c x_crl.c x_x509.c
 SRCS+= a_hdr.c a_strnid.c d2i_pu.c p5_pbev2.c tasn_enc.c x_exten.c x_x509a.c
 SRCS+= a_i2d_fp.c a_time.c evp_asn1.c tasn_fre.c x_info.c
 SRCS+=a_int.c a_type.c p8_pkey.c tasn_new.c x_long.c asn_moid.c
-CFLAGS+= -I${LCRYPTO_SRC}/x509
 SRCS+= x509_d2.c x509_lu.c x509_set.c x509_vfy.c x509spki.c by_dir.c
 SRCS+= x509_def.c x509_obj.c x509_trs.c x509cset.c x509type.c by_file.c
 SRCS+= x509_att.c x509_err.c x509_r2x.c x509_txt.c x509name.c x_all.c
 SRCS+= x509_cmp.c x509_ext.c x509_req.c x509_v3.c x509rset.c
-CFLAGS+= -I${LCRYPTO_SRC}/x509v3
 SRCS+=  v3_akey.c v3_alt.c v3_bcons.c v3_bitst.c v3_conf.c v3_cpols.c
 SRCS+=  v3_crld.c v3_enum.c v3_extku.c v3_genn.c v3_ia5.c v3_int.c
 SRCS+=  v3_lib.c v3_pku.c v3_prn.c v3_skey.c v3_sxnet.c v3_utl.c
 SRCS+=  v3err.c v3_info.c v3_purp.c v3_ocsp.c v3_akeya.c
-CFLAGS+= -I${LCRYPTO_SRC}/conf
 SRCS+=  conf_err.c conf_lib.c conf_def.c conf_api.c conf_mod.c conf_mall.c
 SRCS+=  conf_sap.c
-CFLAGS+= -I${LCRYPTO_SRC}/txt_db
 SRCS+=  txt_db.c                                                        
-CFLAGS+= -I${LCRYPTO_SRC}/pkcs7
 SRCS+= pk7_lib.c pkcs7err.c
 SRCS+= pk7_asn1.c pk7_doit.c pk7_mime.c 
 SRCS+= pk7_attr.c pk7_smime.c
-CFLAGS+= -I${LCRYPTO_SRC}/comp
 SRCS+=  c_rle.c c_zlib.c comp_lib.c comp_err.c
-CFLAGS+= -I${LCRYPTO_SRC}/pkcs12
 SRCS+=  p12_add.c p12_crpt.c p12_init.c p12_mutl.c p12_p8e.c
 SRCS+=  p12_asn.c p12_crt.c p12_key.c p12_npas.c p12_utl.c
 SRCS+=  p12_attr.c p12_decr.c p12_kiss.c p12_p8d.c pk12err.c
-CFLAGS+= -I${LCRYPTO_SRC}/engine
 SRCS+= eng_all.c eng_openssl.c eng_ctrl.c eng_pkey.c
 SRCS+= eng_dyn.c eng_table.c tb_cipher.c eng_err.c tb_rsa.c
 SRCS+= hw_cryptodev.c eng_cnf.c
 SRCS+= tb_dh.c eng_fat.c tb_digest.c eng_init.c
 SRCS+= tb_dsa.c eng_lib.c tb_rand.c eng_list.c
 SRCs+= tb_rsa.c
-CFLAGS+= -I${LCRYPTO_SRC}/dso
 SRCS+= dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c
 SRCS+= dso_openssl.c dso_win32.c dso_vms.c
-CFLAGS+= -I${LCRYPTO_SRC}/oscp
 SRCS+= ocsp_asn.c ocsp_err.c ocsp_ht.c ocsp_prn.c ocsp_vfy.c
 SRCS+= ocsp_cl.c ocsp_ext.c ocsp_lib.c ocsp_srv.c
-CFLAGS+= -I${LCRYPTO_SRC}/ec
 SRCS+= ec_cvt.c ec_lib.c ecp_mont.c ecp_recp.c
 SRCS+= ec_err.c ec_mult.c ecp_nist.c ecp_smpl.c