diff options
| author | deraadt <> | 2014-04-18 14:41:54 +0000 |
|---|---|---|
| committer | deraadt <> | 2014-04-18 14:41:54 +0000 |
| commit | 1c9078e645c831ab23c4e86eab52204af91e7461 (patch) | |
| tree | 0a9517a1584e192597d4123b5f70df6dd60a3029 | |
| parent | ade9fbef99b78ab1e042fd491648066f3e008e92 (diff) | |
| download | openbsd-1c9078e645c831ab23c4e86eab52204af91e7461.tar.gz openbsd-1c9078e645c831ab23c4e86eab52204af91e7461.tar.bz2 openbsd-1c9078e645c831ab23c4e86eab52204af91e7461.zip | |
since e_os.h is dead, and e_os2.h is installed, we can fetch from there.
This means we don't need the reach-around anymore.
Diffstat (limited to '')
| -rw-r--r-- | src/usr.sbin/openssl/Makefile | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/usr.sbin/openssl/Makefile b/src/usr.sbin/openssl/Makefile index 2a2df8f2e6..da72cbeeab 100644 --- a/src/usr.sbin/openssl/Makefile +++ b/src/usr.sbin/openssl/Makefile | |||
| @@ -1,18 +1,12 @@ | |||
| 1 | # $OpenBSD: Makefile,v 1.25 2014/04/17 22:44:34 matthew Exp $ | 1 | # $OpenBSD: Makefile,v 1.26 2014/04/18 14:41:54 deraadt Exp $ |
| 2 | 2 | ||
| 3 | PROG= openssl | 3 | PROG= openssl |
| 4 | LDADD= -lssl -lcrypto | 4 | LDADD= -lssl -lcrypto |
| 5 | MAN1= openssl.1 | 5 | MAN1= openssl.1 |
| 6 | 6 | ||
| 7 | SSLEAYDIST= lib/libssl/src | ||
| 8 | |||
| 9 | SSLEAY_SRC= ${.CURDIR}/../../${SSLEAYDIST}/apps | ||
| 10 | SSLEAY_SRC_TOP= ${.CURDIR}/../../${SSLEAYDIST} | ||
| 11 | |||
| 12 | CFLAGS+= -Wall | 7 | CFLAGS+= -Wall |
| 13 | CFLAGS+= -DTERMIOS -DANSI_SOURCE -DOPENSSL_NO_RC5 | 8 | CFLAGS+= -DTERMIOS -DANSI_SOURCE -DOPENSSL_NO_RC5 |
| 14 | CFLAGS+= -DOPENSSL_NO_SSL2 | 9 | CFLAGS+= -DOPENSSL_NO_SSL2 |
| 15 | CFLAGS+= -I${SSLEAY_SRC_TOP} | ||
| 16 | 10 | ||
| 17 | SRCS= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c \ | 11 | SRCS= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c \ |
| 18 | pkcs7.c crl2p7.c crl.c ca.c \ | 12 | pkcs7.c crl2p7.c crl.c ca.c \ |
| @@ -23,6 +17,6 @@ SRCS= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c \ | |||
| 23 | spkac.c smime.c cms.c rand.c engine.c ocsp.c prime.c ts.c \ | 17 | spkac.c smime.c cms.c rand.c engine.c ocsp.c prime.c ts.c \ |
| 24 | openssl.c s_cb.c dhparam.c | 18 | openssl.c s_cb.c dhparam.c |
| 25 | 19 | ||
| 26 | .PATH: ${SSLEAY_SRC} | 20 | .PATH: ${.CURDIR}/../../lib/libssl/src/apps |
| 27 | 21 | ||
| 28 | .include <bsd.prog.mk> | 22 | .include <bsd.prog.mk> |
