summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authordsl <dsl@NetBSD.org>2006-03-17 20:47:45 +0000
committerdsl <dsl@NetBSD.org>2006-03-17 20:47:45 +0000
commit0ab764f9ffe2ecfd84bde512ddedb2209b613d07 (patch)
treee63be9fce935170971c7205790777051adcac995 /lib
parentcbe6a15c0124a7e8c83092dde83c1f66f28422b9 (diff)
Don't add every source directory to the -I path.
Instead use CPPFLAGS.file to add the relevant directory for each file. Removes about 4000000 failed open() system calls from the libcrypto build, and reduces the compile time (on my system) from 154 seconds to 115 seconds. The arch/*/*.inc files need similar treatment.
Diffstat (limited to 'lib')
-rw-r--r--lib/libcrypto/aes.inc10
-rw-r--r--lib/libcrypto/asn1.inc10
-rw-r--r--lib/libcrypto/bf.inc10
-rw-r--r--lib/libcrypto/bio.inc10
-rw-r--r--lib/libcrypto/bn.inc10
-rw-r--r--lib/libcrypto/buffer.inc10
-rw-r--r--lib/libcrypto/cast.inc10
-rw-r--r--lib/libcrypto/comp.inc10
-rw-r--r--lib/libcrypto/conf.inc10
-rw-r--r--lib/libcrypto/crypto.inc10
-rw-r--r--lib/libcrypto/des.inc10
-rw-r--r--lib/libcrypto/dh.inc10
-rw-r--r--lib/libcrypto/dsa.inc10
-rw-r--r--lib/libcrypto/dso.inc10
-rw-r--r--lib/libcrypto/ec.inc10
-rw-r--r--lib/libcrypto/ecdh.inc10
-rw-r--r--lib/libcrypto/ecdsa.inc10
-rw-r--r--lib/libcrypto/engine.inc10
-rw-r--r--lib/libcrypto/err.inc10
-rw-r--r--lib/libcrypto/evp.inc10
-rw-r--r--lib/libcrypto/hmac.inc10
-rw-r--r--lib/libcrypto/idea.inc12
-rw-r--r--lib/libcrypto/krb5.inc10
-rw-r--r--lib/libcrypto/lhash.inc10
-rw-r--r--lib/libcrypto/man.inc7
-rw-r--r--lib/libcrypto/md2.inc10
-rw-r--r--lib/libcrypto/md4.inc10
-rw-r--r--lib/libcrypto/md5.inc10
-rw-r--r--lib/libcrypto/mdc2.inc12
-rw-r--r--lib/libcrypto/objects.inc10
-rw-r--r--lib/libcrypto/ocsp.inc10
-rw-r--r--lib/libcrypto/pem.inc10
-rw-r--r--lib/libcrypto/pkcs12.inc10
-rw-r--r--lib/libcrypto/pkcs7.inc10
-rw-r--r--lib/libcrypto/pqueue.inc10
-rw-r--r--lib/libcrypto/rand.inc10
-rw-r--r--lib/libcrypto/rc2.inc10
-rw-r--r--lib/libcrypto/rc4.inc10
-rw-r--r--lib/libcrypto/rc5.inc12
-rw-r--r--lib/libcrypto/ripemd.inc10
-rw-r--r--lib/libcrypto/rsa.inc10
-rw-r--r--lib/libcrypto/sha.inc10
-rw-r--r--lib/libcrypto/stack.inc10
-rw-r--r--lib/libcrypto/store.inc10
-rw-r--r--lib/libcrypto/txt_db.inc10
-rw-r--r--lib/libcrypto/ui.inc10
-rw-r--r--lib/libcrypto/x509.inc10
-rw-r--r--lib/libcrypto/x509v3.inc10
48 files changed, 338 insertions, 145 deletions
diff --git a/lib/libcrypto/aes.inc b/lib/libcrypto/aes.inc
index 8642655540c..8dc7c672bb7 100644
--- a/lib/libcrypto/aes.inc
+++ b/lib/libcrypto/aes.inc
@@ -1,4 +1,4 @@
-# $NetBSD: aes.inc,v 1.1 2003/07/24 14:16:31 itojun Exp $
+# $NetBSD: aes.inc,v 1.2 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/aes
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/aes
-SRCS+=aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c aes_ctr.c
+AES_SRCS = aes_core.c aes_misc.c aes_ecb.c aes_cbc.c aes_cfb.c aes_ofb.c aes_ctr.c
+SRCS += ${AES_SRCS}
+
+.for cryptosrc in ${AES_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/aes
+.endfor
diff --git a/lib/libcrypto/asn1.inc b/lib/libcrypto/asn1.inc
index f8266ff577e..fa62d9f0601 100644
--- a/lib/libcrypto/asn1.inc
+++ b/lib/libcrypto/asn1.inc
@@ -1,4 +1,4 @@
-# $NetBSD: asn1.inc,v 1.6 2005/11/25 19:15:08 christos Exp $
+# $NetBSD: asn1.inc,v 1.7 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,9 +7,8 @@
.PATH: ${OPENSSLSRC}/crypto/asn1
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/asn1
-SRCS+= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \
+ASN1_SRCS = a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \
a_print.c a_type.c a_set.c a_dup.c a_d2i_fp.c a_i2d_fp.c \
a_enum.c a_utf8.c a_sign.c a_digest.c a_verify.c a_mbstr.c a_strex.c \
x_algor.c x_val.c x_pubkey.c x_sig.c x_req.c x_attrib.c x_bignum.c \
@@ -22,3 +21,8 @@ SRCS+= a_object.c a_bitstr.c a_utctm.c a_gentm.c a_time.c a_int.c a_octet.c \
asn1_par.c asn1_lib.c asn1_err.c a_meth.c a_bytes.c a_strnid.c \
evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c \
asn1_gen.c
+SRCS += ${ASN1_SRCS}
+
+.for cryptosrc in ${ASN1_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/asn1
+.endfor
diff --git a/lib/libcrypto/bf.inc b/lib/libcrypto/bf.inc
index 47b7f1f21f2..5cbfaa1debd 100644
--- a/lib/libcrypto/bf.inc
+++ b/lib/libcrypto/bf.inc
@@ -1,4 +1,4 @@
-# $NetBSD: bf.inc,v 1.6 2003/07/24 14:16:31 itojun Exp $
+# $NetBSD: bf.inc,v 1.7 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/bf
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/bf
-SRCS+=bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c
+BF_SRCS = bf_skey.c bf_ecb.c bf_enc.c bf_cfb64.c bf_ofb64.c
+SRCS += ${BF_SRCS}
+
+.for cryptosrc in ${BF_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/bf
+.endfor
diff --git a/lib/libcrypto/bio.inc b/lib/libcrypto/bio.inc
index 289349d3627..05a9fe094c5 100644
--- a/lib/libcrypto/bio.inc
+++ b/lib/libcrypto/bio.inc
@@ -1,4 +1,4 @@
-# $NetBSD: bio.inc,v 1.5 2005/11/26 00:35:58 christos Exp $
+# $NetBSD: bio.inc,v 1.6 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,10 +7,14 @@
.PATH: ${OPENSSLSRC}/crypto/bio
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/bio
-SRCS+= bio_lib.c bio_cb.c bio_err.c \
+BIO_SRCS = bio_lib.c bio_cb.c bio_err.c \
bss_mem.c bss_null.c bss_fd.c \
bss_file.c bss_sock.c bss_conn.c \
bf_null.c bf_buff.c b_print.c b_dump.c \
b_sock.c bss_acpt.c bf_nbio.c bss_log.c bss_bio.c bss_dgram.c
+SRCS += ${BIO_SRCS}
+
+.for cryptosrc in ${BIO_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/bio
+.endfor
diff --git a/lib/libcrypto/bn.inc b/lib/libcrypto/bn.inc
index f74eb514fe2..05bbd946c0c 100644
--- a/lib/libcrypto/bn.inc
+++ b/lib/libcrypto/bn.inc
@@ -1,4 +1,4 @@
-# $NetBSD: bn.inc,v 1.6 2005/11/25 20:34:58 christos Exp $
+# $NetBSD: bn.inc,v 1.7 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,9 +7,13 @@
.PATH: ${OPENSSLSRC}/crypto/bn
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/bn
-SRCS+= bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c \
+BN_SRCS = bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c bn_mod.c \
bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \
bn_kron.c bn_sqrt.c bn_gcd.c bn_prime.c bn_err.c bn_sqr.c bn_asm.c \
bn_recp.c bn_mont.c bn_mpi.c bn_exp2.c bn_nist.c bn_gf2m.c bn_depr.c
+SRCS += ${BN_SRCS}
+
+.for cryptosrc in ${BN_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/bn
+.endfor
diff --git a/lib/libcrypto/buffer.inc b/lib/libcrypto/buffer.inc
index f05480b1c6c..a28ee08d86a 100644
--- a/lib/libcrypto/buffer.inc
+++ b/lib/libcrypto/buffer.inc
@@ -1,4 +1,4 @@
-# $NetBSD: buffer.inc,v 1.4 2003/07/24 14:16:31 itojun Exp $
+# $NetBSD: buffer.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/buffer
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/buffer
-SRCS+= buffer.c buf_err.c
+BUFFER_SRCS = buffer.c buf_err.c
+SRCS += ${BUFFER_SRCS}
+
+.for cryptosrc in ${BUFFER_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/buffer
+.endfor
diff --git a/lib/libcrypto/cast.inc b/lib/libcrypto/cast.inc
index c805331ace1..c67e704e160 100644
--- a/lib/libcrypto/cast.inc
+++ b/lib/libcrypto/cast.inc
@@ -1,4 +1,4 @@
-# $NetBSD: cast.inc,v 1.4 2003/07/24 14:16:31 itojun Exp $
+# $NetBSD: cast.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/cast
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/cast
-SRCS+=c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c
+CAST_SRCS = c_skey.c c_ecb.c c_enc.c c_cfb64.c c_ofb64.c
+SRCS += ${CAST_SRCS}
+
+.for cryptosrc in ${CAST_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/cast
+.endfor
diff --git a/lib/libcrypto/comp.inc b/lib/libcrypto/comp.inc
index b2eaa53fe49..021994df1b8 100644
--- a/lib/libcrypto/comp.inc
+++ b/lib/libcrypto/comp.inc
@@ -1,4 +1,4 @@
-# $NetBSD: comp.inc,v 1.4 2003/07/24 14:16:31 itojun Exp $
+# $NetBSD: comp.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,7 +7,11 @@
.PATH: ${OPENSSLSRC}/crypto/comp
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/comp
-SRCS+= comp_lib.c comp_err.c \
+COMP_SRCS = comp_lib.c comp_err.c \
c_rle.c c_zlib.c
+SRCS += ${COMP_SRCS}
+
+.for cryptosrc in ${COMP_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/comp
+.endfor
diff --git a/lib/libcrypto/conf.inc b/lib/libcrypto/conf.inc
index 64c0b0048d1..3f3225e3376 100644
--- a/lib/libcrypto/conf.inc
+++ b/lib/libcrypto/conf.inc
@@ -1,4 +1,4 @@
-# $NetBSD: conf.inc,v 1.5 2003/07/24 14:16:31 itojun Exp $
+# $NetBSD: conf.inc,v 1.6 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,7 +7,11 @@
.PATH: ${OPENSSLSRC}/crypto/conf
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/conf
-SRCS+= conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c \
+CONF_SRCS = conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c \
conf_mall.c conf_sap.c
+SRCS += ${CONF_SRCS}
+
+.for cryptosrc in ${CONF_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/conf
+.endfor
diff --git a/lib/libcrypto/crypto.inc b/lib/libcrypto/crypto.inc
index fc9a1dd0c8f..394371e8811 100644
--- a/lib/libcrypto/crypto.inc
+++ b/lib/libcrypto/crypto.inc
@@ -1,4 +1,4 @@
-# $NetBSD: crypto.inc,v 1.6 2005/11/25 23:18:13 christos Exp $
+# $NetBSD: crypto.inc,v 1.7 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,7 +7,11 @@
.PATH: ${OPENSSLSRC}/crypto
-CPPFLAGS+= -I${OPENSSLSRC}/crypto
-SRCS+= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c tmdiff.c \
+CRYPTO_SRCS = cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c tmdiff.c \
cpt_err.c ebcdic.c uid.c o_time.c o_dir.c
+SRCS += ${CRYPTO_SRCS}
+
+.for cryptosrc in ${CRYPTO_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/crypto
+.endfor
diff --git a/lib/libcrypto/des.inc b/lib/libcrypto/des.inc
index 5611a100df3..1bacf66d219 100644
--- a/lib/libcrypto/des.inc
+++ b/lib/libcrypto/des.inc
@@ -1,4 +1,4 @@
-# $NetBSD: des.inc,v 1.9 2003/07/24 14:16:32 itojun Exp $
+# $NetBSD: des.inc,v 1.10 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,9 +7,8 @@
.PATH: ${OPENSSLSRC}/crypto/des
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/des
-SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \
+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 \
fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c \
qud_cksm.c rand_key.c rpc_enc.c set_key.c \
@@ -18,3 +17,8 @@ SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \
str2key.c cfb64ede.c ofb64ede.c ede_cbcm_enc.c \
read2pwd.c
# des_old.c des_old2.c
+SRCS += ${DES_SRCS}
+
+.for cryptosrc in ${DES_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/des
+.endfor
diff --git a/lib/libcrypto/dh.inc b/lib/libcrypto/dh.inc
index b7de2f46fec..877ea27d0f8 100644
--- a/lib/libcrypto/dh.inc
+++ b/lib/libcrypto/dh.inc
@@ -1,4 +1,4 @@
-# $NetBSD: dh.inc,v 1.5 2005/11/27 02:00:46 christos Exp $
+# $NetBSD: dh.inc,v 1.6 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/dh
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/dh
-SRCS+= dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c
+DH_SRCS = dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c
+SRCS += ${DH_SRCS}
+
+.for cryptosrc in ${DH_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/dh
+.endfor
diff --git a/lib/libcrypto/dsa.inc b/lib/libcrypto/dsa.inc
index 280d7661164..9a552dcae9e 100644
--- a/lib/libcrypto/dsa.inc
+++ b/lib/libcrypto/dsa.inc
@@ -1,4 +1,4 @@
-# $NetBSD: dsa.inc,v 1.5 2005/11/25 20:34:58 christos Exp $
+# $NetBSD: dsa.inc,v 1.6 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,7 +7,11 @@
.PATH: ${OPENSSLSRC}/crypto/dsa
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/dsa
-SRCS+= dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c \
+DSA_SRCS = dsa_gen.c dsa_key.c dsa_lib.c dsa_asn1.c dsa_vrf.c dsa_sign.c \
dsa_err.c dsa_ossl.c dsa_depr.c
+SRCS += ${DSA_SRCS}
+
+.for cryptosrc in ${DSA_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/dsa
+.endfor
diff --git a/lib/libcrypto/dso.inc b/lib/libcrypto/dso.inc
index 65de8b6ae98..b1d9d2d2a76 100644
--- a/lib/libcrypto/dso.inc
+++ b/lib/libcrypto/dso.inc
@@ -1,4 +1,4 @@
-# $NetBSD: dso.inc,v 1.1 2001/04/12 07:48:04 itojun Exp $
+# $NetBSD: dso.inc,v 1.2 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,7 +7,11 @@
.PATH: ${OPENSSLSRC}/crypto/dso
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/dso
-SRCS+= dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c \
+DSO_SRCS = dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c \
dso_openssl.c dso_win32.c dso_vms.c
+SRCS += ${DSO_SRCS}
+
+.for cryptosrc in ${DSO_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/dso
+.endfor
diff --git a/lib/libcrypto/ec.inc b/lib/libcrypto/ec.inc
index b5d401c43dd..53c1ffa6999 100644
--- a/lib/libcrypto/ec.inc
+++ b/lib/libcrypto/ec.inc
@@ -1,4 +1,4 @@
-# $NetBSD: ec.inc,v 1.2 2005/11/25 19:15:08 christos Exp $
+# $NetBSD: ec.inc,v 1.3 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,8 +7,12 @@
.PATH: ${OPENSSLSRC}/crypto/ec
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/ec
-SRCS+= ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c \
+EC_SRCS = ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c \
ec_err.c ec_asn1.c ec_key.c ec_print.c ec_curve.c ec2_smpl.c \
ec2_mult.c ec_check.c
+SRCS += ${EC_SRCS}
+
+.for cryptosrc in ${EC_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/ec
+.endfor
diff --git a/lib/libcrypto/ecdh.inc b/lib/libcrypto/ecdh.inc
index 80b8d58a3d3..7687d2522ce 100644
--- a/lib/libcrypto/ecdh.inc
+++ b/lib/libcrypto/ecdh.inc
@@ -1,4 +1,4 @@
-# $NetBSD: ecdh.inc,v 1.1 2005/11/25 19:15:08 christos Exp $
+# $NetBSD: ecdh.inc,v 1.2 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/ecdh
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/ecdh
-SRCS+= ech_err.c ech_key.c ech_lib.c ech_ossl.c
+ECDH_SRCS = ech_err.c ech_key.c ech_lib.c ech_ossl.c
+SRCS += ${ECDH_SRCS}
+
+.for cryptosrc in ${ECDH_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/ecdh
+.endfor
diff --git a/lib/libcrypto/ecdsa.inc b/lib/libcrypto/ecdsa.inc
index fa279a07155..2e67560a4e9 100644
--- a/lib/libcrypto/ecdsa.inc
+++ b/lib/libcrypto/ecdsa.inc
@@ -1,4 +1,4 @@
-# $NetBSD: ecdsa.inc,v 1.1 2005/11/25 19:15:08 christos Exp $
+# $NetBSD: ecdsa.inc,v 1.2 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,7 +7,11 @@
.PATH: ${OPENSSLSRC}/crypto/ecdsa
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/ecdsa
-SRCS+= ecs_asn1.c ecs_err.c ecs_lib.c ecs_locl.h ecs_ossl.c ecs_sign.c \
+ECDSA_SRCS = ecs_asn1.c ecs_err.c ecs_lib.c ecs_locl.h ecs_ossl.c ecs_sign.c \
ecs_vrf.c
+SRCS += ${ECDSA_SRCS}
+
+.for cryptosrc in ${ECDSA_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/ecdsa
+.endfor
diff --git a/lib/libcrypto/engine.inc b/lib/libcrypto/engine.inc
index 893c9bbf919..d32eef1b778 100644
--- a/lib/libcrypto/engine.inc
+++ b/lib/libcrypto/engine.inc
@@ -1,4 +1,4 @@
-# $NetBSD: engine.inc,v 1.2 2005/11/25 19:15:08 christos Exp $
+# $NetBSD: engine.inc,v 1.3 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,9 +7,8 @@
.PATH: ${OPENSSLSRC}/crypto/engine ${OPENSSLSRC}/engines
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/engine -I${OPENSSLSRC}/engines
-SRCS+= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \
+ENGINE_SRCS = eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \
eng_table.c eng_pkey.c eng_fat.c eng_all.c \
tb_rsa.c tb_dsa.c tb_dh.c tb_rand.c tb_cipher.c tb_digest.c \
eng_openssl.c eng_dyn.c eng_cnf.c eng_padlock.c \
@@ -23,3 +22,8 @@ SRCS+= eng_err.c eng_lib.c eng_list.c eng_init.c eng_ctrl.c \
e_nuron.c e_nuron_err.c \
e_sureware.c e_sureware_err.c \
e_ubsec.c e_ubsec_err.c
+SRCS += ${ENGINE_SRCS}
+
+.for cryptosrc in ${ENGINE_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/engine
+.endfor
diff --git a/lib/libcrypto/err.inc b/lib/libcrypto/err.inc
index 8bf500d8b2d..f1bf8192f86 100644
--- a/lib/libcrypto/err.inc
+++ b/lib/libcrypto/err.inc
@@ -1,4 +1,4 @@
-# $NetBSD: err.inc,v 1.4 2003/07/24 14:16:32 itojun Exp $
+# $NetBSD: err.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/err
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/err
-SRCS+=err.c err_all.c err_prn.c
+ERR_SRCS = err.c err_all.c err_prn.c
+SRCS += ${ERR_SRCS}
+
+.for cryptosrc in ${ERR_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/err
+.endfor
diff --git a/lib/libcrypto/evp.inc b/lib/libcrypto/evp.inc
index e09134d010f..09c7f50239b 100644
--- a/lib/libcrypto/evp.inc
+++ b/lib/libcrypto/evp.inc
@@ -1,4 +1,4 @@
-# $NetBSD: evp.inc,v 1.6 2005/11/25 19:15:08 christos Exp $
+# $NetBSD: evp.inc,v 1.7 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,9 +7,8 @@
.PATH: ${OPENSSLSRC}/crypto/evp
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/evp
-SRCS+= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \
+EVP_SRCS = encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \
e_des.c e_bf.c e_idea.c e_des3.c \
e_rc4.c e_aes.c names.c \
e_xcbc_d.c e_rc2.c e_cast.c e_rc5.c \
@@ -19,3 +18,8 @@ SRCS+= encode.c digest.c evp_enc.c evp_key.c evp_acnf.c \
bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \
c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \
evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c m_ecdsa.c
+SRCS += ${EVP_SRCS}
+
+.for cryptosrc in ${EVP_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/evp
+.endfor
diff --git a/lib/libcrypto/hmac.inc b/lib/libcrypto/hmac.inc
index 68ac3f090c2..17b9c085249 100644
--- a/lib/libcrypto/hmac.inc
+++ b/lib/libcrypto/hmac.inc
@@ -1,4 +1,4 @@
-# $NetBSD: hmac.inc,v 1.4 2003/07/24 14:16:32 itojun Exp $
+# $NetBSD: hmac.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/hmac
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/hmac
-SRCS+=hmac.c
+HMAC_SRCS = hmac.c
+SRCS += ${HMAC_SRCS}
+
+.for cryptosrc in ${HMAC_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/hmac
+.endfor
diff --git a/lib/libcrypto/idea.inc b/lib/libcrypto/idea.inc
index 98984458ef1..7e4cbfe7fcc 100644
--- a/lib/libcrypto/idea.inc
+++ b/lib/libcrypto/idea.inc
@@ -1,4 +1,4 @@
-# $NetBSD: idea.inc,v 1.4 2000/09/30 00:23:37 itojun Exp $
+# $NetBSD: idea.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,10 +7,14 @@
.PATH: ${OPENSSLSRC}/crypto/idea
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/idea
-SRCS+=i_cfb64.c i_ofb64.c i_ecb.c
+IDEA_SRCS = i_cfb64.c i_ofb64.c i_ecb.c
# IDEA is a patented algorithm; abort().
# see ../libcrypto_idea
-SRCS+=i_cbc_dummy.c i_skey_dummy.c
+IDEA_SRCS = i_cbc_dummy.c i_skey_dummy.c
#SRCS+=i_cbc.c i_skey.c
+SRCS += ${IDEA_SRCS}
+
+.for cryptosrc in ${IDEA_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/idea
+.endfor
diff --git a/lib/libcrypto/krb5.inc b/lib/libcrypto/krb5.inc
index c961073e12e..ec362677135 100644
--- a/lib/libcrypto/krb5.inc
+++ b/lib/libcrypto/krb5.inc
@@ -1,4 +1,4 @@
-# $NetBSD: krb5.inc,v 1.1 2003/07/24 14:16:32 itojun Exp $
+# $NetBSD: krb5.inc,v 1.2 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/krb5
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/krb5
-SRCS+= krb5_asn.c
+KRB5_SRCS = krb5_asn.c
+SRCS += ${KRB5_SRCS}
+
+.for cryptosrc in ${KRB5_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/krb5
+.endfor
diff --git a/lib/libcrypto/lhash.inc b/lib/libcrypto/lhash.inc
index 419c11da529..4a9c22ade91 100644
--- a/lib/libcrypto/lhash.inc
+++ b/lib/libcrypto/lhash.inc
@@ -1,4 +1,4 @@
-# $NetBSD: lhash.inc,v 1.4 2003/07/24 14:16:32 itojun Exp $
+# $NetBSD: lhash.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/lhash
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/lhash
-SRCS+=lhash.c lh_stats.c
+LHASH_SRCS = lhash.c lh_stats.c
+SRCS += ${LHASH_SRCS}
+
+.for cryptosrc in ${LHASH_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/lhash
+.endfor
diff --git a/lib/libcrypto/man.inc b/lib/libcrypto/man.inc
index 8f91cabc93e..33196b70c13 100644
--- a/lib/libcrypto/man.inc
+++ b/lib/libcrypto/man.inc
@@ -1,4 +1,4 @@
-# $NetBSD: man.inc,v 1.16 2005/11/26 22:39:15 christos Exp $
+# $NetBSD: man.inc,v 1.17 2006/03/17 20:47:45 dsl Exp $
.PATH: ${.CURDIR}/man
@@ -95,3 +95,8 @@ MAN+= RSA_padding_add_PKCS1_type_1.3 openssl_mdc2.3 BIO_f_base64.3 \
MAN+= openssl.cnf.5
#MAN+= des_modes.7
+SRCS += ${MAN_SRCS}
+
+.for cryptosrc in ${MAN_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/man
+.endfor
diff --git a/lib/libcrypto/md2.inc b/lib/libcrypto/md2.inc
index fe0f7cffb6d..d6508908eac 100644
--- a/lib/libcrypto/md2.inc
+++ b/lib/libcrypto/md2.inc
@@ -1,4 +1,4 @@
-# $NetBSD: md2.inc,v 1.4 2003/07/24 14:16:32 itojun Exp $
+# $NetBSD: md2.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/md2
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/md2
-SRCS+=md2_dgst.c md2_one.c
+MD2_SRCS = md2_dgst.c md2_one.c
+SRCS += ${MD2_SRCS}
+
+.for cryptosrc in ${MD2_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/md2
+.endfor
diff --git a/lib/libcrypto/md4.inc b/lib/libcrypto/md4.inc
index 6f23a9b2c58..bc50c6a32af 100644
--- a/lib/libcrypto/md4.inc
+++ b/lib/libcrypto/md4.inc
@@ -1,4 +1,4 @@
-# $NetBSD: md4.inc,v 1.1 2001/04/12 07:48:04 itojun Exp $
+# $NetBSD: md4.inc,v 1.2 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/md4
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/md4
-SRCS+= md4_dgst.c md4_one.c
+MD4_SRCS = md4_dgst.c md4_one.c
+SRCS += ${MD4_SRCS}
+
+.for cryptosrc in ${MD4_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/md4
+.endfor
diff --git a/lib/libcrypto/md5.inc b/lib/libcrypto/md5.inc
index 37155b2fb03..06f5bc6a311 100644
--- a/lib/libcrypto/md5.inc
+++ b/lib/libcrypto/md5.inc
@@ -1,4 +1,4 @@
-# $NetBSD: md5.inc,v 1.4 2003/07/24 14:16:32 itojun Exp $
+# $NetBSD: md5.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/md5
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/md5
-SRCS+=md5_dgst.c md5_one.c $(MD5_ASM_OBJ)
+MD5_SRCS = md5_dgst.c md5_one.c $(MD5_ASM_OBJ)
+SRCS += ${MD5_SRCS}
+
+.for cryptosrc in ${MD5_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/md5
+.endfor
diff --git a/lib/libcrypto/mdc2.inc b/lib/libcrypto/mdc2.inc
index b902f8358d9..3617837461a 100644
--- a/lib/libcrypto/mdc2.inc
+++ b/lib/libcrypto/mdc2.inc
@@ -1,4 +1,4 @@
-# $NetBSD: mdc2.inc,v 1.5 2002/09/26 13:05:54 itojun Exp $
+# $NetBSD: mdc2.inc,v 1.6 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,10 +7,14 @@
.PATH: ${OPENSSLSRC}/crypto/mdc2
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/mdc2
-SRCS+= mdc2_one.c
+MDC2_SRCS = mdc2_one.c
# MDC2 is a patented algorithm; abort().
# see ../libcrypto_mdc2
-SRCS+= mdc2dgst_dummy.c
+MDC2_SRCS = mdc2dgst_dummy.c
#SRCS+= mdc2dgst.c
+SRCS += ${MDC2_SRCS}
+
+.for cryptosrc in ${MDC2_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/mdc2
+.endfor
diff --git a/lib/libcrypto/objects.inc b/lib/libcrypto/objects.inc
index d07c11c7feb..19d4ad45d2d 100644
--- a/lib/libcrypto/objects.inc
+++ b/lib/libcrypto/objects.inc
@@ -1,4 +1,4 @@
-# $NetBSD: objects.inc,v 1.4 2003/07/24 14:16:32 itojun Exp $
+# $NetBSD: objects.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/objects
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/objects
-SRCS+= o_names.c obj_dat.c obj_lib.c obj_err.c
+OBJECTS_SRCS = o_names.c obj_dat.c obj_lib.c obj_err.c
+SRCS += ${OBJECTS_SRCS}
+
+.for cryptosrc in ${OBJECTS_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/objects
+.endfor
diff --git a/lib/libcrypto/ocsp.inc b/lib/libcrypto/ocsp.inc
index 7690c91efee..25bc88e7a6c 100644
--- a/lib/libcrypto/ocsp.inc
+++ b/lib/libcrypto/ocsp.inc
@@ -1,4 +1,4 @@
-# $NetBSD: ocsp.inc,v 1.1 2003/07/24 14:16:32 itojun Exp $
+# $NetBSD: ocsp.inc,v 1.2 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,7 +7,11 @@
.PATH: ${OPENSSLSRC}/crypto/ocsp
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/ocsp
-SRCS+= ocsp_asn.c ocsp_ext.c ocsp_ht.c ocsp_lib.c ocsp_cl.c \
+OCSP_SRCS = ocsp_asn.c ocsp_ext.c ocsp_ht.c ocsp_lib.c ocsp_cl.c \
ocsp_srv.c ocsp_prn.c ocsp_vfy.c ocsp_err.c
+SRCS += ${OCSP_SRCS}
+
+.for cryptosrc in ${OCSP_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/ocsp
+.endfor
diff --git a/lib/libcrypto/pem.inc b/lib/libcrypto/pem.inc
index 713b520f088..299a61772c0 100644
--- a/lib/libcrypto/pem.inc
+++ b/lib/libcrypto/pem.inc
@@ -1,4 +1,4 @@
-# $NetBSD: pem.inc,v 1.4 2003/07/24 14:16:32 itojun Exp $
+# $NetBSD: pem.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,7 +7,11 @@
.PATH: ${OPENSSLSRC}/crypto/pem
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/pem
-SRCS+= pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c \
+PEM_SRCS = pem_sign.c pem_seal.c pem_info.c pem_lib.c pem_all.c pem_err.c \
pem_x509.c pem_xaux.c pem_oth.c pem_pk8.c pem_pkey.c
+SRCS += ${PEM_SRCS}
+
+.for cryptosrc in ${PEM_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/pem
+.endfor
diff --git a/lib/libcrypto/pkcs12.inc b/lib/libcrypto/pkcs12.inc
index a53c0b7ee31..cac32efd8e0 100644
--- a/lib/libcrypto/pkcs12.inc
+++ b/lib/libcrypto/pkcs12.inc
@@ -1,4 +1,4 @@
-# $NetBSD: pkcs12.inc,v 1.4 2003/07/24 14:16:32 itojun Exp $
+# $NetBSD: pkcs12.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,8 +7,12 @@
.PATH: ${OPENSSLSRC}/crypto/pkcs12
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/pkcs12
-SRCS+= p12_add.c p12_asn.c p12_attr.c p12_crpt.c p12_crt.c p12_decr.c \
+PKCS12_SRCS = p12_add.c p12_asn.c p12_attr.c p12_crpt.c p12_crt.c p12_decr.c \
p12_init.c p12_key.c p12_kiss.c p12_mutl.c\
p12_utl.c p12_npas.c pk12err.c p12_p8d.c p12_p8e.c
+SRCS += ${PKCS12_SRCS}
+
+.for cryptosrc in ${PKCS12_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/pkcs12
+.endfor
diff --git a/lib/libcrypto/pkcs7.inc b/lib/libcrypto/pkcs7.inc
index 227fb9c1360..478c6a0b1a7 100644
--- a/lib/libcrypto/pkcs7.inc
+++ b/lib/libcrypto/pkcs7.inc
@@ -1,4 +1,4 @@
-# $NetBSD: pkcs7.inc,v 1.4 2003/07/24 14:16:33 itojun Exp $
+# $NetBSD: pkcs7.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,7 +7,11 @@
.PATH: ${OPENSSLSRC}/crypto/pkcs7
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/pkcs7
-SRCS+= pk7_asn1.c pk7_lib.c pkcs7err.c pk7_doit.c pk7_smime.c pk7_attr.c \
+PKCS7_SRCS = pk7_asn1.c pk7_lib.c pkcs7err.c pk7_doit.c pk7_smime.c pk7_attr.c \
pk7_mime.c
+SRCS += ${PKCS7_SRCS}
+
+.for cryptosrc in ${PKCS7_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/pkcs7
+.endfor
diff --git a/lib/libcrypto/pqueue.inc b/lib/libcrypto/pqueue.inc
index 9e5c9db0d4d..65d9b32b909 100644
--- a/lib/libcrypto/pqueue.inc
+++ b/lib/libcrypto/pqueue.inc
@@ -1,4 +1,4 @@
-# $NetBSD: pqueue.inc,v 1.1 2005/11/26 00:35:58 christos Exp $
+# $NetBSD: pqueue.inc,v 1.2 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/pqueue
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/pqueue
-SRCS+= pqueue.c
+PQUEUE_SRCS = pqueue.c
+SRCS += ${PQUEUE_SRCS}
+
+.for cryptosrc in ${PQUEUE_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/pqueue
+.endfor
diff --git a/lib/libcrypto/rand.inc b/lib/libcrypto/rand.inc
index 30d6f2a75a5..040c18bd3d6 100644
--- a/lib/libcrypto/rand.inc
+++ b/lib/libcrypto/rand.inc
@@ -1,4 +1,4 @@
-# $NetBSD: rand.inc,v 1.5 2003/07/24 14:16:33 itojun Exp $
+# $NetBSD: rand.inc,v 1.6 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,7 +7,11 @@
.PATH: ${OPENSSLSRC}/crypto/rand
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/rand
-SRCS+= md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \
+RAND_SRCS = md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \
rand_win.c rand_unix.c rand_os2.c
+SRCS += ${RAND_SRCS}
+
+.for cryptosrc in ${RAND_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/rand
+.endfor
diff --git a/lib/libcrypto/rc2.inc b/lib/libcrypto/rc2.inc
index 1f373589d85..3e729d3fc5e 100644
--- a/lib/libcrypto/rc2.inc
+++ b/lib/libcrypto/rc2.inc
@@ -1,4 +1,4 @@
-# $NetBSD: rc2.inc,v 1.4 2003/07/24 14:16:33 itojun Exp $
+# $NetBSD: rc2.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/rc2
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/rc2
-SRCS+=rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c rc2ofb64.c
+RC2_SRCS = rc2_ecb.c rc2_skey.c rc2_cbc.c rc2cfb64.c rc2ofb64.c
+SRCS += ${RC2_SRCS}
+
+.for cryptosrc in ${RC2_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/rc2
+.endfor
diff --git a/lib/libcrypto/rc4.inc b/lib/libcrypto/rc4.inc
index c1c6d180d2f..506016d75ec 100644
--- a/lib/libcrypto/rc4.inc
+++ b/lib/libcrypto/rc4.inc
@@ -1,4 +1,4 @@
-# $NetBSD: rc4.inc,v 1.4 2003/07/24 14:16:33 itojun Exp $
+# $NetBSD: rc4.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/rc4
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/rc4
-SRCS+=rc4_skey.c rc4_enc.c
+RC4_SRCS = rc4_skey.c rc4_enc.c
+SRCS += ${RC4_SRCS}
+
+.for cryptosrc in ${RC4_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/rc4
+.endfor
diff --git a/lib/libcrypto/rc5.inc b/lib/libcrypto/rc5.inc
index d4396f24ea4..7afc565a10e 100644
--- a/lib/libcrypto/rc5.inc
+++ b/lib/libcrypto/rc5.inc
@@ -1,4 +1,4 @@
-# $NetBSD: rc5.inc,v 1.5 2003/07/24 14:16:33 itojun Exp $
+# $NetBSD: rc5.inc,v 1.6 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,10 +7,14 @@
.PATH: ${OPENSSLSRC}/crypto/rc5
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/rc5
-SRCS+=rc5_ecb.c rc5cfb64.c rc5ofb64.c
+RC5_SRCS = rc5_ecb.c rc5cfb64.c rc5ofb64.c
# RC5 is a patented algorithm; abort().
# see ../libcrypto_rc5
-SRCS+=rc5_skey_dummy.c rc5_enc_dummy.c
+RC5_SRCS = rc5_skey_dummy.c rc5_enc_dummy.c
#SRCS+=rc5_skey.c rc5_enc.c
+SRCS += ${RC5_SRCS}
+
+.for cryptosrc in ${RC5_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/rc5
+.endfor
diff --git a/lib/libcrypto/ripemd.inc b/lib/libcrypto/ripemd.inc
index f5986713469..e494e6ea31e 100644
--- a/lib/libcrypto/ripemd.inc
+++ b/lib/libcrypto/ripemd.inc
@@ -1,4 +1,4 @@
-# $NetBSD: ripemd.inc,v 1.4 2003/07/24 14:16:33 itojun Exp $
+# $NetBSD: ripemd.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/ripemd
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/ripemd
-SRCS+=rmd_dgst.c rmd_one.c
+RIPEMD_SRCS = rmd_dgst.c rmd_one.c
+SRCS += ${RIPEMD_SRCS}
+
+.for cryptosrc in ${RIPEMD_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/ripemd
+.endfor
diff --git a/lib/libcrypto/rsa.inc b/lib/libcrypto/rsa.inc
index 3a1aa6f43fb..b674bf0e15c 100644
--- a/lib/libcrypto/rsa.inc
+++ b/lib/libcrypto/rsa.inc
@@ -1,4 +1,4 @@
-# $NetBSD: rsa.inc,v 1.6 2005/11/25 20:34:58 christos Exp $
+# $NetBSD: rsa.inc,v 1.7 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,8 +7,12 @@
.PATH: ${OPENSSLSRC}/crypto/rsa
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/rsa
-SRCS+= rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c \
+RSA_SRCS = rsa_eay.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c \
rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c rsa_null.c \
rsa_asn1.c rsa_x931.c rsa_depr.c
+SRCS += ${RSA_SRCS}
+
+.for cryptosrc in ${RSA_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/rsa
+.endfor
diff --git a/lib/libcrypto/sha.inc b/lib/libcrypto/sha.inc
index c6d64e74319..9b41b942c95 100644
--- a/lib/libcrypto/sha.inc
+++ b/lib/libcrypto/sha.inc
@@ -1,4 +1,4 @@
-# $NetBSD: sha.inc,v 1.7 2005/11/26 00:35:58 christos Exp $
+# $NetBSD: sha.inc,v 1.8 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/sha
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/sha
-SRCS+=sha_dgst.c sha1dgst.c sha_one.c sha1_one.c sha256.c sha512.c
+SHA_SRCS = sha_dgst.c sha1dgst.c sha_one.c sha1_one.c sha256.c sha512.c
+SRCS += ${SHA_SRCS}
+
+.for cryptosrc in ${SHA_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/sha
+.endfor
diff --git a/lib/libcrypto/stack.inc b/lib/libcrypto/stack.inc
index 8e5fb6afb86..bf32ed5bc98 100644
--- a/lib/libcrypto/stack.inc
+++ b/lib/libcrypto/stack.inc
@@ -1,4 +1,4 @@
-# $NetBSD: stack.inc,v 1.4 2003/07/24 14:16:33 itojun Exp $
+# $NetBSD: stack.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/stack
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/stack
-SRCS+=stack.c
+STACK_SRCS = stack.c
+SRCS += ${STACK_SRCS}
+
+.for cryptosrc in ${STACK_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/stack
+.endfor
diff --git a/lib/libcrypto/store.inc b/lib/libcrypto/store.inc
index f19ca01eb12..ce54c545e03 100644
--- a/lib/libcrypto/store.inc
+++ b/lib/libcrypto/store.inc
@@ -1,4 +1,4 @@
-# $NetBSD: store.inc,v 1.1 2005/11/25 19:15:08 christos Exp $
+# $NetBSD: store.inc,v 1.2 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/store
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/store
-SRCS+= str_err.c str_lib.c str_locl.h str_mem.c str_meth.c
+STORE_SRCS = str_err.c str_lib.c str_locl.h str_mem.c str_meth.c
+SRCS += ${STORE_SRCS}
+
+.for cryptosrc in ${STORE_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/store
+.endfor
diff --git a/lib/libcrypto/txt_db.inc b/lib/libcrypto/txt_db.inc
index 0541ef78e3c..5c7858a5abe 100644
--- a/lib/libcrypto/txt_db.inc
+++ b/lib/libcrypto/txt_db.inc
@@ -1,4 +1,4 @@
-# $NetBSD: txt_db.inc,v 1.4 2003/07/24 14:16:33 itojun Exp $
+# $NetBSD: txt_db.inc,v 1.5 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/txt_db
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/txt_db
-SRCS+=txt_db.c
+TXT_DB_SRCS = txt_db.c
+SRCS += ${TXT_DB_SRCS}
+
+.for cryptosrc in ${TXT_DB_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/txt_db
+.endfor
diff --git a/lib/libcrypto/ui.inc b/lib/libcrypto/ui.inc
index ac4cea776c0..5cfd7d8a6b6 100644
--- a/lib/libcrypto/ui.inc
+++ b/lib/libcrypto/ui.inc
@@ -1,4 +1,4 @@
-# $NetBSD: ui.inc,v 1.1 2003/07/24 14:16:33 itojun Exp $
+# $NetBSD: ui.inc,v 1.2 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,6 +7,10 @@
.PATH: ${OPENSSLSRC}/crypto/ui
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/ui
-SRCS+= ui_err.c ui_lib.c ui_openssl.c ui_util.c $(COMPATSRC)
+UI_SRCS = ui_err.c ui_lib.c ui_openssl.c ui_util.c $(COMPATSRC)
+SRCS += ${UI_SRCS}
+
+.for cryptosrc in ${UI_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/ui
+.endfor
diff --git a/lib/libcrypto/x509.inc b/lib/libcrypto/x509.inc
index ed9f2b464ec..1dbbc2ca147 100644
--- a/lib/libcrypto/x509.inc
+++ b/lib/libcrypto/x509.inc
@@ -1,4 +1,4 @@
-# $NetBSD: x509.inc,v 1.5 2005/11/25 19:15:08 christos Exp $
+# $NetBSD: x509.inc,v 1.6 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,11 +7,15 @@
.PATH: ${OPENSSLSRC}/crypto/x509
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/x509
-SRCS+= x509_def.c x509_d2.c x509_r2x.c x509_cmp.c \
+X509_SRCS = x509_def.c x509_d2.c x509_r2x.c x509_cmp.c \
x509_obj.c x509_req.c x509spki.c x509_vfy.c \
x509_set.c x509cset.c x509rset.c x509_err.c \
x509name.c x509_v3.c x509_ext.c x509_att.c \
x509type.c x509_lu.c x_all.c x509_txt.c \
x509_trs.c x509_vpm.c by_file.c by_dir.c
+SRCS += ${X509_SRCS}
+
+.for cryptosrc in ${X509_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/x509
+.endfor
diff --git a/lib/libcrypto/x509v3.inc b/lib/libcrypto/x509v3.inc
index a366b442e28..a2e2657cc6a 100644
--- a/lib/libcrypto/x509v3.inc
+++ b/lib/libcrypto/x509v3.inc
@@ -1,4 +1,4 @@
-# $NetBSD: x509v3.inc,v 1.7 2005/11/25 19:15:08 christos Exp $
+# $NetBSD: x509v3.inc,v 1.8 2006/03/17 20:47:45 dsl Exp $
#
# @(#) Copyright (c) 1995 Simon J. Gerraty
#
@@ -7,10 +7,14 @@
.PATH: ${OPENSSLSRC}/crypto/x509v3
-CPPFLAGS+= -I${OPENSSLSRC}/crypto/x509v3
-SRCS+= v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c \
+X509V3_SRCS = v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c \
v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c v3_pku.c \
v3_int.c v3_enum.c v3_sxnet.c v3_cpols.c v3_crld.c v3_pci.c v3_pcia.c \
v3_purp.c v3_info.c v3_ocsp.c v3_akeya.c pcy_tree.c v3_pmaps.c pcy_data.c \
v3_pcons.c pcy_lib.c pcy_node.c pcy_cache.c pcy_map.c v3_ncons.c
+SRCS += ${X509V3_SRCS}
+
+.for cryptosrc in ${X509V3_SRCS}
+CPPFLAGS.${cryptosrc} = -I${OPENSSLSRC}/crypto/x509v3
+.endfor