summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/libssl/crypto-patent/Makefile5
-rw-r--r--lib/libssl/crypto/Makefile5
-rw-r--r--lib/libssl/ssl-patent/Makefile37
-rw-r--r--lib/libssl/ssl/Makefile37
4 files changed, 72 insertions, 12 deletions
diff --git a/lib/libssl/crypto-patent/Makefile b/lib/libssl/crypto-patent/Makefile
index b08ad387639..74b98926f17 100644
--- a/lib/libssl/crypto-patent/Makefile
+++ b/lib/libssl/crypto-patent/Makefile
@@ -4,7 +4,6 @@ LIB= crypto
SSLEAYDIST= src-patent
LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
-SSLEAY_INC= ${.CURDIR}/../${SSLEAYDIST}/include
.if ${MACHINE_ARCH} == "i386"
CFLAGS+= -DL_ENDIAN -DBN_ASM
@@ -17,7 +16,7 @@ CFLAGS+= -DB_ENDIAN
.endif
CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE
-CFLAGS+= -I${SSLEAY_INC}
+CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
CFLAGS+= -I${LCRYPTO_SRC}
SRCS+= cryptlib.c mem.c cversion.c ex_data.c cpt_err.c
CFLAGS+= -I${LCRYPTO_SRC}/md2
@@ -143,7 +142,7 @@ HDRS= asn1/asn1.h asn1/asn1_mac.h bf/blowfish.h bio/bio.h \
md2/md2.h md5/md5.h mdc2/mdc2.h objects/objects.h pem/pem.h \
pkcs7/pkcs7.h rand/rand.h rc2/rc2.h rc4/rc4.h rc5/rc5.h \
ripemd/ripemd.h rsa/rsa.h sha/sha.h stack/stack.h txt_db/txt_db.h \
- x509/x509.h x509/x509_vfy.h crypto.h cryptall.h ../include/e_os.h
+ x509/x509.h x509/x509_vfy.h crypto.h cryptall.h ../e_os.h
.PATH: ${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/mdc2 \
${LCRYPTO_SRC}/hmac ${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/des ${LCRYPTO_SRC}/rc2 \
diff --git a/lib/libssl/crypto/Makefile b/lib/libssl/crypto/Makefile
index ec9e75dd4dc..516609d8d15 100644
--- a/lib/libssl/crypto/Makefile
+++ b/lib/libssl/crypto/Makefile
@@ -4,7 +4,6 @@ LIB= crypto
SSLEAYDIST= src
LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
-SSLEAY_INC= ${.CURDIR}/../${SSLEAYDIST}/include
.if ${MACHINE_ARCH} == "i386"
CFLAGS+= -DL_ENDIAN -DBN_ASM
@@ -17,7 +16,7 @@ CFLAGS+= -DB_ENDIAN
.endif
CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE
-CFLAGS+= -I${SSLEAY_INC}
+CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
CFLAGS+= -I${LCRYPTO_SRC}
SRCS+= cryptlib.c mem.c cversion.c ex_data.c cpt_err.c
CFLAGS+= -I${LCRYPTO_SRC}/md2
@@ -143,7 +142,7 @@ HDRS= asn1/asn1.h asn1/asn1_mac.h bf/blowfish.h bio/bio.h \
md2/md2.h md5/md5.h mdc2/mdc2.h objects/objects.h pem/pem.h \
pkcs7/pkcs7.h rand/rand.h rc2/rc2.h rc4/rc4.h rc5/rc5.h \
ripemd/ripemd.h rsa/rsa.h sha/sha.h stack/stack.h txt_db/txt_db.h \
- x509/x509.h x509/x509_vfy.h crypto.h cryptall.h ../include/e_os.h
+ x509/x509.h x509/x509_vfy.h crypto.h cryptall.h ../e_os.h
.PATH: ${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/mdc2 \
${LCRYPTO_SRC}/hmac ${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/des ${LCRYPTO_SRC}/rc2 \
diff --git a/lib/libssl/ssl-patent/Makefile b/lib/libssl/ssl-patent/Makefile
index 4831fcfe427..09e9de7fb47 100644
--- a/lib/libssl/ssl-patent/Makefile
+++ b/lib/libssl/ssl-patent/Makefile
@@ -4,8 +4,7 @@ LIB= ssl
SSLEAYDIST= src-patent
LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl
-SSLEAY_INC= ${.CURDIR}/../${SSLEAYDIST}/include
-LCRYPTO_INC= ${.CURDIR}/../${SSLEAYDIST}/crypto
+LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
.if ${MACHINE_ARCH} == "i386"
CFLAGS+= -DL_ENDIAN -DBN_ASM
@@ -17,7 +16,39 @@ CFLAGS+= -DB_ENDIAN
.endif
.endif
CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE
-CFLAGS+= -I${LSSL_SRC} -I${SSLEAY_INC} -I${LCRYPTO_INC}
+CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
+CFLAGS+= -I${LSSL_SRC} -I${LCRYPTO_SRC}
+CFLAGS+= -I${LCRYPTO_SRC}/md2
+CFLAGS+= -I${LCRYPTO_SRC}/md5
+CFLAGS+= -I${LCRYPTO_SRC}/sha
+CFLAGS+= -I${LCRYPTO_SRC}/mdc2
+CFLAGS+= -I${LCRYPTO_SRC}/hmac
+CFLAGS+= -I${LCRYPTO_SRC}/ripemd
+CFLAGS+= -I${LCRYPTO_SRC}/des
+CFLAGS+= -I${LCRYPTO_SRC}/rc2
+CFLAGS+= -I${LCRYPTO_SRC}/rc4
+CFLAGS+= -I${LCRYPTO_SRC}/rc5
+CFLAGS+= -I${LCRYPTO_SRC}/idea
+CFLAGS+= -I${LCRYPTO_SRC}/bf
+CFLAGS+= -I${LCRYPTO_SRC}/cast
+CFLAGS+= -I${LCRYPTO_SRC}/bn
+CFLAGS+= -I${LCRYPTO_SRC}/rsa
+CFLAGS+= -I${LCRYPTO_SRC}/dsa
+CFLAGS+= -I${LCRYPTO_SRC}/dh
+CFLAGS+= -I${LCRYPTO_SRC}/buffer
+CFLAGS+= -I${LCRYPTO_SRC}/bio
+CFLAGS+= -I${LCRYPTO_SRC}/stack
+CFLAGS+= -I${LCRYPTO_SRC}/lhash
+CFLAGS+= -I${LCRYPTO_SRC}/rand
+CFLAGS+= -I${LCRYPTO_SRC}/err
+CFLAGS+= -I${LCRYPTO_SRC}/objects
+CFLAGS+= -I${LCRYPTO_SRC}/evp
+CFLAGS+= -I${LCRYPTO_SRC}/pem
+CFLAGS+= -I${LCRYPTO_SRC}/asn1
+CFLAGS+= -I${LCRYPTO_SRC}/x509
+CFLAGS+= -I${LCRYPTO_SRC}/conf
+CFLAGS+= -I${LCRYPTO_SRC}/txt_db
+CFLAGS+= -I${LCRYPTO_SRC}/pkcs7
SRCS= s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \
s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \
diff --git a/lib/libssl/ssl/Makefile b/lib/libssl/ssl/Makefile
index a2fce87b5cb..facbfa9ca7a 100644
--- a/lib/libssl/ssl/Makefile
+++ b/lib/libssl/ssl/Makefile
@@ -4,8 +4,7 @@ LIB= ssl
SSLEAYDIST= src
LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl
-SSLEAY_INC= ${.CURDIR}/../${SSLEAYDIST}/include
-LCRYPTO_INC= ${.CURDIR}/../${SSLEAYDIST}/crypto
+LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
.if ${MACHINE_ARCH} == "i386"
CFLAGS+= -DL_ENDIAN -DBN_ASM
@@ -17,7 +16,39 @@ CFLAGS+= -DB_ENDIAN
.endif
.endif
CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE
-CFLAGS+= -I${LSSL_SRC} -I${SSLEAY_INC} -I${LCRYPTO_INC}
+CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
+CFLAGS+= -I${LSSL_SRC} -I${LCRYPTO_SRC}
+CFLAGS+= -I${LCRYPTO_SRC}/md2
+CFLAGS+= -I${LCRYPTO_SRC}/md5
+CFLAGS+= -I${LCRYPTO_SRC}/sha
+CFLAGS+= -I${LCRYPTO_SRC}/mdc2
+CFLAGS+= -I${LCRYPTO_SRC}/hmac
+CFLAGS+= -I${LCRYPTO_SRC}/ripemd
+CFLAGS+= -I${LCRYPTO_SRC}/des
+CFLAGS+= -I${LCRYPTO_SRC}/rc2
+CFLAGS+= -I${LCRYPTO_SRC}/rc4
+CFLAGS+= -I${LCRYPTO_SRC}/rc5
+CFLAGS+= -I${LCRYPTO_SRC}/idea
+CFLAGS+= -I${LCRYPTO_SRC}/bf
+CFLAGS+= -I${LCRYPTO_SRC}/cast
+CFLAGS+= -I${LCRYPTO_SRC}/bn
+CFLAGS+= -I${LCRYPTO_SRC}/rsa
+CFLAGS+= -I${LCRYPTO_SRC}/dsa
+CFLAGS+= -I${LCRYPTO_SRC}/dh
+CFLAGS+= -I${LCRYPTO_SRC}/buffer
+CFLAGS+= -I${LCRYPTO_SRC}/bio
+CFLAGS+= -I${LCRYPTO_SRC}/stack
+CFLAGS+= -I${LCRYPTO_SRC}/lhash
+CFLAGS+= -I${LCRYPTO_SRC}/rand
+CFLAGS+= -I${LCRYPTO_SRC}/err
+CFLAGS+= -I${LCRYPTO_SRC}/objects
+CFLAGS+= -I${LCRYPTO_SRC}/evp
+CFLAGS+= -I${LCRYPTO_SRC}/pem
+CFLAGS+= -I${LCRYPTO_SRC}/asn1
+CFLAGS+= -I${LCRYPTO_SRC}/x509
+CFLAGS+= -I${LCRYPTO_SRC}/conf
+CFLAGS+= -I${LCRYPTO_SRC}/txt_db
+CFLAGS+= -I${LCRYPTO_SRC}/pkcs7
SRCS= s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \
s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \