summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbeck <>1998-10-06 17:55:42 +0000
committerbeck <>1998-10-06 17:55:42 +0000
commit8274f78a1993a0c345ca2b0ffcbde3b0c6d3b023 (patch)
treec01fce0a6bf15c42db5ad56608b13b0afdedf1d8 /src
parent9e43e2ac1373d5be5c6500c1bc3b1dd6ee9584b4 (diff)
downloadopenbsd-8274f78a1993a0c345ca2b0ffcbde3b0c6d3b023.tar.gz
openbsd-8274f78a1993a0c345ca2b0ffcbde3b0c6d3b023.tar.bz2
openbsd-8274f78a1993a0c345ca2b0ffcbde3b0c6d3b023.zip
Fix makefile problems - Don't use SSLeay style include link farm to
build - get includes from where they really live.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/crypto-patent/Makefile5
-rw-r--r--src/lib/libssl/crypto/Makefile5
-rw-r--r--src/lib/libssl/ssl-patent/Makefile37
-rw-r--r--src/lib/libssl/ssl/Makefile37
4 files changed, 72 insertions, 12 deletions
diff --git a/src/lib/libssl/crypto-patent/Makefile b/src/lib/libssl/crypto-patent/Makefile
index b08ad38763..74b98926f1 100644
--- a/src/lib/libssl/crypto-patent/Makefile
+++ b/src/lib/libssl/crypto-patent/Makefile
@@ -4,7 +4,6 @@ LIB= crypto
4SSLEAYDIST= src-patent 4SSLEAYDIST= src-patent
5 5
6LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto 6LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
7SSLEAY_INC= ${.CURDIR}/../${SSLEAYDIST}/include
8 7
9.if ${MACHINE_ARCH} == "i386" 8.if ${MACHINE_ARCH} == "i386"
10CFLAGS+= -DL_ENDIAN -DBN_ASM 9CFLAGS+= -DL_ENDIAN -DBN_ASM
@@ -17,7 +16,7 @@ CFLAGS+= -DB_ENDIAN
17.endif 16.endif
18 17
19CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE 18CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE
20CFLAGS+= -I${SSLEAY_INC} 19CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
21CFLAGS+= -I${LCRYPTO_SRC} 20CFLAGS+= -I${LCRYPTO_SRC}
22SRCS+= cryptlib.c mem.c cversion.c ex_data.c cpt_err.c 21SRCS+= cryptlib.c mem.c cversion.c ex_data.c cpt_err.c
23CFLAGS+= -I${LCRYPTO_SRC}/md2 22CFLAGS+= -I${LCRYPTO_SRC}/md2
@@ -143,7 +142,7 @@ HDRS= asn1/asn1.h asn1/asn1_mac.h bf/blowfish.h bio/bio.h \
143 md2/md2.h md5/md5.h mdc2/mdc2.h objects/objects.h pem/pem.h \ 142 md2/md2.h md5/md5.h mdc2/mdc2.h objects/objects.h pem/pem.h \
144 pkcs7/pkcs7.h rand/rand.h rc2/rc2.h rc4/rc4.h rc5/rc5.h \ 143 pkcs7/pkcs7.h rand/rand.h rc2/rc2.h rc4/rc4.h rc5/rc5.h \
145 ripemd/ripemd.h rsa/rsa.h sha/sha.h stack/stack.h txt_db/txt_db.h \ 144 ripemd/ripemd.h rsa/rsa.h sha/sha.h stack/stack.h txt_db/txt_db.h \
146 x509/x509.h x509/x509_vfy.h crypto.h cryptall.h ../include/e_os.h 145 x509/x509.h x509/x509_vfy.h crypto.h cryptall.h ../e_os.h
147 146
148.PATH: ${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/mdc2 \ 147.PATH: ${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/mdc2 \
149 ${LCRYPTO_SRC}/hmac ${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/des ${LCRYPTO_SRC}/rc2 \ 148 ${LCRYPTO_SRC}/hmac ${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/des ${LCRYPTO_SRC}/rc2 \
diff --git a/src/lib/libssl/crypto/Makefile b/src/lib/libssl/crypto/Makefile
index ec9e75dd4d..516609d8d1 100644
--- a/src/lib/libssl/crypto/Makefile
+++ b/src/lib/libssl/crypto/Makefile
@@ -4,7 +4,6 @@ LIB= crypto
4SSLEAYDIST= src 4SSLEAYDIST= src
5 5
6LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto 6LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
7SSLEAY_INC= ${.CURDIR}/../${SSLEAYDIST}/include
8 7
9.if ${MACHINE_ARCH} == "i386" 8.if ${MACHINE_ARCH} == "i386"
10CFLAGS+= -DL_ENDIAN -DBN_ASM 9CFLAGS+= -DL_ENDIAN -DBN_ASM
@@ -17,7 +16,7 @@ CFLAGS+= -DB_ENDIAN
17.endif 16.endif
18 17
19CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE 18CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE
20CFLAGS+= -I${SSLEAY_INC} 19CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
21CFLAGS+= -I${LCRYPTO_SRC} 20CFLAGS+= -I${LCRYPTO_SRC}
22SRCS+= cryptlib.c mem.c cversion.c ex_data.c cpt_err.c 21SRCS+= cryptlib.c mem.c cversion.c ex_data.c cpt_err.c
23CFLAGS+= -I${LCRYPTO_SRC}/md2 22CFLAGS+= -I${LCRYPTO_SRC}/md2
@@ -143,7 +142,7 @@ HDRS= asn1/asn1.h asn1/asn1_mac.h bf/blowfish.h bio/bio.h \
143 md2/md2.h md5/md5.h mdc2/mdc2.h objects/objects.h pem/pem.h \ 142 md2/md2.h md5/md5.h mdc2/mdc2.h objects/objects.h pem/pem.h \
144 pkcs7/pkcs7.h rand/rand.h rc2/rc2.h rc4/rc4.h rc5/rc5.h \ 143 pkcs7/pkcs7.h rand/rand.h rc2/rc2.h rc4/rc4.h rc5/rc5.h \
145 ripemd/ripemd.h rsa/rsa.h sha/sha.h stack/stack.h txt_db/txt_db.h \ 144 ripemd/ripemd.h rsa/rsa.h sha/sha.h stack/stack.h txt_db/txt_db.h \
146 x509/x509.h x509/x509_vfy.h crypto.h cryptall.h ../include/e_os.h 145 x509/x509.h x509/x509_vfy.h crypto.h cryptall.h ../e_os.h
147 146
148.PATH: ${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/mdc2 \ 147.PATH: ${LCRYPTO_SRC}/md2 ${LCRYPTO_SRC}/md5 ${LCRYPTO_SRC}/sha ${LCRYPTO_SRC}/mdc2 \
149 ${LCRYPTO_SRC}/hmac ${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/des ${LCRYPTO_SRC}/rc2 \ 148 ${LCRYPTO_SRC}/hmac ${LCRYPTO_SRC}/ripemd ${LCRYPTO_SRC}/des ${LCRYPTO_SRC}/rc2 \
diff --git a/src/lib/libssl/ssl-patent/Makefile b/src/lib/libssl/ssl-patent/Makefile
index 4831fcfe42..09e9de7fb4 100644
--- a/src/lib/libssl/ssl-patent/Makefile
+++ b/src/lib/libssl/ssl-patent/Makefile
@@ -4,8 +4,7 @@ LIB= ssl
4SSLEAYDIST= src-patent 4SSLEAYDIST= src-patent
5 5
6LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl 6LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl
7SSLEAY_INC= ${.CURDIR}/../${SSLEAYDIST}/include 7LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
8LCRYPTO_INC= ${.CURDIR}/../${SSLEAYDIST}/crypto
9 8
10.if ${MACHINE_ARCH} == "i386" 9.if ${MACHINE_ARCH} == "i386"
11CFLAGS+= -DL_ENDIAN -DBN_ASM 10CFLAGS+= -DL_ENDIAN -DBN_ASM
@@ -17,7 +16,39 @@ CFLAGS+= -DB_ENDIAN
17.endif 16.endif
18.endif 17.endif
19CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE 18CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE
20CFLAGS+= -I${LSSL_SRC} -I${SSLEAY_INC} -I${LCRYPTO_INC} 19CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
20CFLAGS+= -I${LSSL_SRC} -I${LCRYPTO_SRC}
21CFLAGS+= -I${LCRYPTO_SRC}/md2
22CFLAGS+= -I${LCRYPTO_SRC}/md5
23CFLAGS+= -I${LCRYPTO_SRC}/sha
24CFLAGS+= -I${LCRYPTO_SRC}/mdc2
25CFLAGS+= -I${LCRYPTO_SRC}/hmac
26CFLAGS+= -I${LCRYPTO_SRC}/ripemd
27CFLAGS+= -I${LCRYPTO_SRC}/des
28CFLAGS+= -I${LCRYPTO_SRC}/rc2
29CFLAGS+= -I${LCRYPTO_SRC}/rc4
30CFLAGS+= -I${LCRYPTO_SRC}/rc5
31CFLAGS+= -I${LCRYPTO_SRC}/idea
32CFLAGS+= -I${LCRYPTO_SRC}/bf
33CFLAGS+= -I${LCRYPTO_SRC}/cast
34CFLAGS+= -I${LCRYPTO_SRC}/bn
35CFLAGS+= -I${LCRYPTO_SRC}/rsa
36CFLAGS+= -I${LCRYPTO_SRC}/dsa
37CFLAGS+= -I${LCRYPTO_SRC}/dh
38CFLAGS+= -I${LCRYPTO_SRC}/buffer
39CFLAGS+= -I${LCRYPTO_SRC}/bio
40CFLAGS+= -I${LCRYPTO_SRC}/stack
41CFLAGS+= -I${LCRYPTO_SRC}/lhash
42CFLAGS+= -I${LCRYPTO_SRC}/rand
43CFLAGS+= -I${LCRYPTO_SRC}/err
44CFLAGS+= -I${LCRYPTO_SRC}/objects
45CFLAGS+= -I${LCRYPTO_SRC}/evp
46CFLAGS+= -I${LCRYPTO_SRC}/pem
47CFLAGS+= -I${LCRYPTO_SRC}/asn1
48CFLAGS+= -I${LCRYPTO_SRC}/x509
49CFLAGS+= -I${LCRYPTO_SRC}/conf
50CFLAGS+= -I${LCRYPTO_SRC}/txt_db
51CFLAGS+= -I${LCRYPTO_SRC}/pkcs7
21 52
22SRCS= s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \ 53SRCS= s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \
23 s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \ 54 s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \
diff --git a/src/lib/libssl/ssl/Makefile b/src/lib/libssl/ssl/Makefile
index a2fce87b5c..facbfa9ca7 100644
--- a/src/lib/libssl/ssl/Makefile
+++ b/src/lib/libssl/ssl/Makefile
@@ -4,8 +4,7 @@ LIB= ssl
4SSLEAYDIST= src 4SSLEAYDIST= src
5 5
6LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl 6LSSL_SRC= ${.CURDIR}/../${SSLEAYDIST}/ssl
7SSLEAY_INC= ${.CURDIR}/../${SSLEAYDIST}/include 7LCRYPTO_SRC= ${.CURDIR}/../${SSLEAYDIST}/crypto
8LCRYPTO_INC= ${.CURDIR}/../${SSLEAYDIST}/crypto
9 8
10.if ${MACHINE_ARCH} == "i386" 9.if ${MACHINE_ARCH} == "i386"
11CFLAGS+= -DL_ENDIAN -DBN_ASM 10CFLAGS+= -DL_ENDIAN -DBN_ASM
@@ -17,7 +16,39 @@ CFLAGS+= -DB_ENDIAN
17.endif 16.endif
18.endif 17.endif
19CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE 18CFLAGS+= -DNO_IDEA -DTERMIOS -DANSI_SOURCE
20CFLAGS+= -I${LSSL_SRC} -I${SSLEAY_INC} -I${LCRYPTO_INC} 19CFLAGS+= -I${.CURDIR}/../${SSLEAYDIST}
20CFLAGS+= -I${LSSL_SRC} -I${LCRYPTO_SRC}
21CFLAGS+= -I${LCRYPTO_SRC}/md2
22CFLAGS+= -I${LCRYPTO_SRC}/md5
23CFLAGS+= -I${LCRYPTO_SRC}/sha
24CFLAGS+= -I${LCRYPTO_SRC}/mdc2
25CFLAGS+= -I${LCRYPTO_SRC}/hmac
26CFLAGS+= -I${LCRYPTO_SRC}/ripemd
27CFLAGS+= -I${LCRYPTO_SRC}/des
28CFLAGS+= -I${LCRYPTO_SRC}/rc2
29CFLAGS+= -I${LCRYPTO_SRC}/rc4
30CFLAGS+= -I${LCRYPTO_SRC}/rc5
31CFLAGS+= -I${LCRYPTO_SRC}/idea
32CFLAGS+= -I${LCRYPTO_SRC}/bf
33CFLAGS+= -I${LCRYPTO_SRC}/cast
34CFLAGS+= -I${LCRYPTO_SRC}/bn
35CFLAGS+= -I${LCRYPTO_SRC}/rsa
36CFLAGS+= -I${LCRYPTO_SRC}/dsa
37CFLAGS+= -I${LCRYPTO_SRC}/dh
38CFLAGS+= -I${LCRYPTO_SRC}/buffer
39CFLAGS+= -I${LCRYPTO_SRC}/bio
40CFLAGS+= -I${LCRYPTO_SRC}/stack
41CFLAGS+= -I${LCRYPTO_SRC}/lhash
42CFLAGS+= -I${LCRYPTO_SRC}/rand
43CFLAGS+= -I${LCRYPTO_SRC}/err
44CFLAGS+= -I${LCRYPTO_SRC}/objects
45CFLAGS+= -I${LCRYPTO_SRC}/evp
46CFLAGS+= -I${LCRYPTO_SRC}/pem
47CFLAGS+= -I${LCRYPTO_SRC}/asn1
48CFLAGS+= -I${LCRYPTO_SRC}/x509
49CFLAGS+= -I${LCRYPTO_SRC}/conf
50CFLAGS+= -I${LCRYPTO_SRC}/txt_db
51CFLAGS+= -I${LCRYPTO_SRC}/pkcs7
21 52
22SRCS= s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \ 53SRCS= s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \
23 s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \ 54 s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c \
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-23 01:56:35 +0000