From e785331769023a37dd8b665cd89d2937f9b417f6 Mon Sep 17 00:00:00 2001 From: kris Date: Sun, 17 Sep 2000 06:45:27 +0000 Subject: Overhaul of the build-time include file generation. Don't break in evp.h if bootstrapping from a system on which the openssl headers are not already present. --- secure/lib/libssl/Makefile | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'secure/lib/libssl') diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index e8d4ba5..6a3ab6c 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -20,27 +20,16 @@ SRCS+= bio_ssl.c s23_clnt.c s23_lib.c s23_meth.c s23_pkt.c s23_srvr.c \ HDRS= ssl.h ssl2.h ssl23.h ssl3.h ssl_locl.h tls1.h -CRYPTOHDRS= 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 evp/evp.h hmac/hmac.h lhash/lhash.h md2/md2.h \ - md5/md5.h mdc2/mdc2.h objects/objects.h opensslv.h pem/pem.h \ - pem/pem2.h pkcs12/pkcs12.h pkcs7/pkcs7.h rand/rand.h rc2/rc2.h \ - rc4/rc4.h rc5/rc5.h ripemd/ripemd.h rsa/rsa.h stack/safestack.h \ - sha/sha.h stack/stack.h tmdiff.h txt_db/txt_db.h x509/x509.h \ - x509/x509_vfy.h x509v3/x509v3.h - .for h in ${HDRS} CRYPTO_HDRS+= ${LCRYPTOSSL_SRC}/${h} .endfor -.for h in ${CRYPTOHDRS} -EXTRA_HDRS+= ${LCRYPTO_SRC}/${h} +.for h in ${HDRS} +SSL_HDRS+= ${LCRYPTOSSL_SRC}/${h} .endfor -beforeinstall: openssl/opensslconf.h +beforeinstall: openssl/opensslconf.h openssl/evp.h ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${CRYPTO_HDRS} openssl/opensslconf.h \ - ${DESTDIR}/usr/include/openssl + ${SSL_HDRS} ${DESTDIR}/usr/include/openssl .include -- cgit v1.1