diff options
| -rw-r--r-- | secure/lib/libcrypto/Makefile.inc | 6 | ||||
| -rw-r--r-- | secure/lib/libssl/Makefile | 16 |
2 files changed, 10 insertions, 12 deletions
diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index c719a94..5891d3a 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -14,7 +14,7 @@ CFLAGS+= -DL_ENDIAN -DSHA1_ASM -DBN_ASM -DMD5_ASM -DRMD160_ASM WITH_RSA?= YES -HDRS= asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \ +HDRS+= asn1/asn1.h asn1/asn1_mac.h bio/bio.h bf/blowfish.h bn/bn.h \ buffer/buffer.h cast/cast.h comp/comp.h conf/conf.h crypto.h \ des/des.h dh/dh.h dsa/dsa.h ../e_os.h ../e_os2.h ebcdic.h \ err/err.h hmac/hmac.h lhash/lhash.h md2/md2.h \ @@ -53,8 +53,8 @@ openssl/evp.h: ${LCRYPTO_SRC}/evp/evp.h ${INSTALL} -C -m 444 ${.OODATE} ${.TARGET} .endif -SRCS+= ${HDRS:T:S;^;openssl/;} ${EXTRA_HDRS:T:S;^;openssl/;} -.for h in ${HDRS:S/^/${LCRYPTO_SRC}\//} ${EXTRA_HDRS} +SRCS+= ${HDRS:T:S;^;openssl/;} +.for h in ${HDRS:S/^/${LCRYPTO_SRC}\//} openssl/${h:T}: ${h} mkdir -p openssl ${INSTALL} -C -m 444 ${h} openssl diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index 9fbaf33..7fe0a06 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -1,25 +1,23 @@ # $FreeBSD$ -.include "../libcrypto/Makefile.inc" - -LCRYPTOSSL_SRC=${LCRYPTO_SRC}/../ssl - -.PATH: ${LCRYPTOSSL_SRC} - LIB= ssl SHLIB_MAJOR= 2 MAINTAINER= kris -SRCS+= bio_ssl.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \ +SRCS= bio_ssl.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \ s2_clnt.c s2_enc.c s2_lib.c s2_meth.c s2_pkt.c s2_srvr.c \ s3_both.c s3_clnt.c s3_enc.c s3_lib.c s3_meth.c s3_pkt.c \ s3_srvr.c ssl_algs.c ssl_asn1.c ssl_cert.c ssl_ciph.c \ ssl_err.c ssl_err2.c ssl_lib.c ssl_rsa.c ssl_sess.c ssl_stat.c \ ssl_txt.c t1_clnt.c t1_enc.c t1_lib.c t1_meth.c t1_srvr.o \ -INCS= ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h +INCS= ssl.h ssl2.h ssl23.h ssl3.h tls1.h INCSDIR=${INCLUDEDIR}/openssl -HDRS+= ${INCS:S;^;../ssl/;} +HDRS= ${INCS:S;^;../ssl/;} + +.include "../libcrypto/Makefile.inc" + +.PATH: ${LCRYPTO_SRC}/../ssl .include <bsd.lib.mk> |
