diff options
author | kris <kris@FreeBSD.org> | 2000-09-17 06:45:27 +0000 |
---|---|---|
committer | kris <kris@FreeBSD.org> | 2000-09-17 06:45:27 +0000 |
commit | e785331769023a37dd8b665cd89d2937f9b417f6 (patch) | |
tree | 3c846b20e317d1723a0357c7e83be8e22a274d4d /secure/lib | |
parent | 1f7ac54fbd544b90729437bc61f76addab082c01 (diff) | |
download | FreeBSD-src-e785331769023a37dd8b665cd89d2937f9b417f6.zip FreeBSD-src-e785331769023a37dd8b665cd89d2937f9b417f6.tar.gz |
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.
Diffstat (limited to 'secure/lib')
-rw-r--r-- | secure/lib/libcrypto/Makefile | 30 | ||||
-rw-r--r-- | secure/lib/libcrypto/Makefile.inc | 30 | ||||
-rw-r--r-- | secure/lib/libssl/Makefile | 19 |
3 files changed, 32 insertions, 47 deletions
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index a0cbd78..03098a3 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -175,25 +175,6 @@ SRCS+= v3_akey.c v3_alt.c v3_bcons.c v3_bitst.c v3_conf.c v3_cpols.c \ v3_lib.c v3_pku.c v3_prn.c v3_purp.c v3_skey.c v3_sxnet.c v3_utl.c \ v3err.c -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 \ - 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 - -.if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES -HDRS+= idea/idea.h -.endif - - -.for h in ${HDRS} -CRYPTO_HDRS+= ${LCRYPTO_SRC}/${h} -.endfor - POD1+= apps/CA.pl.pod apps/asn1parse.pod apps/ca.pod apps/ciphers.pod \ apps/config.pod apps/crl.pod apps/crl2pkcs7.pod apps/dgst.pod \ apps/dhparam.pod apps/dsa.pod apps/dsaparam.pod apps/enc.pod \ @@ -268,17 +249,10 @@ MLINKS= des_crypt.3 des_read_password.3 \ des_crypt.3 des_enc_read.3 des_crypt.3 des_enc_write.3 \ des_crypt.3 des_set_odd_parity.3 des_crypt.3 des_is_weak_key.3 -beforeinstall: openssl/opensslconf.h openssl/_evp.h +beforeinstall: openssl/opensslconf.h openssl/evp.h ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${CRYPTO_HDRS} openssl/opensslconf.h \ + ${CRYPTO_HDRS} openssl/evp.h openssl/opensslconf.h \ ${DESTDIR}/usr/include/openssl -.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - openssl/_evp.h ${DESTDIR}/usr/include/openssl/evp.h -.else - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${LCRYPTO_SRC}/evp/evp.h ${DESTDIR}/usr/include/openssl/evp.h -.endif .include <bsd.lib.mk> diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 71a078a..df8adee 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -15,8 +15,26 @@ CFLAGS+= -DL_ENDIAN WITH_RSA?= YES -SRCS+= buildinf.h openssl/opensslconf.h openssl/_evp.h -CLEANFILES+= buildinf.h openssl/opensslconf.h openssl/_evp.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 \ + 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 + +.if defined(MAKE_IDEA) && ${MAKE_IDEA} == YES +HDRS+= idea/idea.h +.endif + +.for h in ${HDRS} +CRYPTO_HDRS+= ${LCRYPTO_SRC}/${h} +.endfor + +SRCS+= buildinf.h openssl/opensslconf.h openssl/evp.h +CLEANFILES+= buildinf.h openssl/opensslconf.h openssl/evp.h CLEANDIRS+= openssl buildinf.h: @@ -31,12 +49,16 @@ buildinf.h: # any of ${CRYPTO_HDRS} ${EXTRA_HDRS} will no repopulate openssl/. # This deficiency will be fixed in a later commit. -.ORDER: openssl/opensslconf.h openssl/_evp.h +.ORDER: openssl/opensslconf.h openssl/evp.h openssl/opensslconf.h: ../libcrypto/opensslconf-${MACHINE_ARCH}.h mkdir -p openssl cp ${.OODATE} ${.TARGET} ${INSTALL} ${COPY} -m 444 ${CRYPTO_HDRS} ${EXTRA_HDRS} openssl -openssl/_evp.h: ${LCRYPTO_SRC}/evp/evp.h +openssl/evp.h: ${LCRYPTO_SRC}/evp/evp.h +.if !defined(MAKE_IDEA) || ${MAKE_IDEA} != YES sed '/^#ifndef NO_IDEA$$/,/^#endif$$/d' ${.OODATE} > ${.TARGET} +.else + ${INSTALL} ${COPY} -m 444 ${.OODATE} ${.TARGET} +.endif 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 <bsd.lib.mk> |