Date: Fri, 31 Jan 2003 13:24:09 +0200 From: Ruslan Ermilov <ru@freebsd.org> To: Mark Murray <markm@freebsd.org> Cc: cvs-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/secure/lib/libcrypto Makefile.inc src/secure/lib/libssl Makefile Message-ID: <20030131112409.GB51054@sunbay.com>
next in thread | raw e-mail | index | archive | help
--H8ygTp4AXg6deix2
Content-Type: multipart/mixed; boundary="Pd0ReVV5GZGQvF3a"
Content-Disposition: inline
--Pd0ReVV5GZGQvF3a
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Fri, Sep 20, 2002 at 11:05:32AM -0700, Kris Kennaway wrote:
> On Fri, Sep 20, 2002 at 06:59:10PM +0300, Ruslan Ermilov wrote:
>=20
> > My proposed "real fix" is to unobfuscate these makefiles by not
> > using the ${.OBJDIR}/openssl, at the cost of losing the ability
> > to build these libraries in the standalone mode (outside of the
> > buildworld and if new headers do not match /usr/include/openssl
> > stuff). This is IMO not a problem, as most utilities depend on
> > new headers already be installed to /usr/include. (Well, the
> > standalone building is still possible with this patch with the
> > "make includes; make ..." approarch, and that is the approach
> > we use during buildworld: "make includes" is the prerequisite
> > for a successful "make depend/all".) Please let me know what
> > do you think.
>=20
> As the maintainer of this code, I do not want to lose the ability to
> build this way.
>=20
Mark,
Your last commit to secure/lib/libssl/Makefile broke the standalone
building of libssl which the former maintainer (Kris) was objecting
to lose. It means that if one does not have all up-to-date headers
under /usr/include, like is the case here, it cannot be built using
only sources. This is not the problem for "buildworld" because it
always installs fresh includes first, and this is still possible
with the attached patch if prepended with "make obj; make includes".
: Script started on Fri Jan 31 11:57:03 2003
: # uname -a
: FreeBSD allmouth.sunbay.crimea.ua 5.0-CURRENT FreeBSD 5.0-CURRENT #3: Thu=
Jan 23 05:54:26 EET 2003 root@allmouth.sunbay.crimea.ua:/usr/obj/CURRE=
NT/usr/src/sys/PERL i386
: # pwd
: /usr/src/secure/lib/libssl
: # make depend
: rm -f .depend
: mkdep -f .depend -a -DTERMIOS -DANSI_SOURCE -DOPENSSL_NO_KRB5 -I/usr/s=
rc/secure/lib/libssl/../../../crypto/openssl -I/usr/src/secure/lib/libssl/.=
./../../crypto/openssl/crypto -I/usr/obj/usr/src/secure/lib/libssl -DOPENSS=
L_NO_IDEA -DL_ENDIAN -DNO_IDEA /usr/src/secure/lib/libssl/../../../crypto/=
openssl/ssl/bio_ssl.c /usr/src/secure/lib/libssl/../../../crypto/openssl/ss=
l/s23_clnt.c /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/s23_lib=
.c /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/s23_meth.c /usr/s=
rc/secure/lib/libssl/../../../crypto/openssl/ssl/s23_pkt.c /usr/src/secure/=
lib/libssl/../../../crypto/openssl/ssl/s23_srvr.c /usr/src/secure/lib/libss=
l/../../../crypto/openssl/ssl/s2_clnt.c /usr/src/secure/lib/libssl/../../..=
/crypto/openssl/ssl/s2_enc.c /usr/src/secure/lib/libssl/../../../crypto/ope=
nssl/ssl/s2_lib.c /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/s2=
_meth.c /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/s2_pkt.c /us=
r/src/secure/lib/libssl/../../../crypto/openssl/ssl/s2_srvr.c /usr/src/secu=
re/lib/libssl/../../../crypto/openssl/ssl/s3_both.c /usr/src/secure/lib/lib=
ssl/../../../crypto/openssl/ssl/s3_clnt.c /usr/src/secure/lib/libssl/../../=
../crypto/openssl/ssl/s3_enc.c /usr/src/secure/lib/libssl/../../../crypto/o=
penssl/ssl/s3_lib.c /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/=
s3_meth.c /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/s3_pkt.c /=
usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/s3_srvr.c /usr/src/se=
cure/lib/libssl/../../../crypto/openssl/ssl/ssl_algs.c /usr/src/secure/lib/=
libssl/../../../crypto/openssl/ssl/ssl_asn1.c /usr/src/secure/lib/libssl/..=
/../../crypto/openssl/ssl/ssl_cert.c /usr/src/secure/lib/libssl/../../../cr=
ypto/openssl/ssl/ssl_ciph.c /usr/src/secure/lib/libssl/../../../crypto/open=
ssl/ssl/ssl_err.c /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/ss=
l_err2.c /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/ssl_lib.c /=
usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/ssl_rsa.c /usr/src/se=
cure/lib/libssl/../../../crypto/openssl/ssl/ssl_sess.c /usr/src/secure/lib/=
libssl/../../../crypto/openssl/ssl/ssl_stat.c /usr/src/secure/lib/libssl/..=
/../../crypto/openssl/ssl/ssl_txt.c /usr/src/secure/lib/libssl/../../../cry=
pto/openssl/ssl/t1_clnt.c /usr/src/secure/lib/libssl/../../../crypto/openss=
l/ssl/t1_enc.c /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/t1_li=
b.c /usr/src/secure/lib/libssl/../../../crypto/openssl/ssl/t1_meth.c /usr/s=
rc/secure/lib/libssl/../../../crypto/openssl/ssl/t1_srvr.c
: In file included from /usr/src/crypto/openssl/ssl/s3_clnt.c:114:
: /usr/src/crypto/openssl/ssl/kssl_lcl.h:62:26: openssl/kssl.h: No such fil=
e or directory
: In file included from /usr/src/crypto/openssl/ssl/s3_lib.c:115:
: /usr/src/crypto/openssl/ssl/kssl_lcl.h:62:26: openssl/kssl.h: No such fil=
e or directory
: In file included from /usr/src/crypto/openssl/ssl/s3_srvr.c:118:
: /usr/src/crypto/openssl/ssl/kssl_lcl.h:62:26: openssl/kssl.h: No such fil=
e or directory
: /usr/src/crypto/openssl/ssl/s3_srvr.c:124:30: openssl/krb5_asn.h: No such=
file or directory
: In file included from /usr/src/crypto/openssl/ssl/ssl_lib.c:120:
: /usr/src/crypto/openssl/ssl/kssl_lcl.h:62:26: openssl/kssl.h: No such fil=
e or directory
: mkdep: compile failed
: *** Error code 1
:=20
: Stop in /usr/src/secure/lib/libssl.
: # ls -l /usr/include/openssl/kssl.h
: ls: /usr/include/openssl/kssl.h: No such file or directory
: # ls -l /usr/src/crypto/openssl/ssl/kssl.h
: -rw-r--r-- 1 root wheel 5873 Jan 28 23:37 /usr/src/crypto/openssl/ssl/=
kssl.h
: #=20
: Script done on Fri Jan 31 11:58:01 2003
So, if you want to "break" it further, please commit the attached
patch. I don't see much point in having so complicated handling
of includes here (this is rather an exception here than a common
practice), and most things cannot be built standalone in an
upgrade scenario (when headers, libraries, and sources do not
match each other), so I'd love to see this committed.
Cheers,
--=20
Ruslan Ermilov Sysadmin and DBA,
ru@sunbay.com Sunbay Software AG,
ru@FreeBSD.org FreeBSD committer,
+380.652.512.251 Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
--Pd0ReVV5GZGQvF3a
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=p
Content-Transfer-Encoding: quoted-printable
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/secure/lib/libcrypto/Makefile,v
retrieving revision 1.54
diff -u -r1.54 Makefile
--- Makefile 29 Jan 2003 18:14:28 -0000 1.54
+++ Makefile 31 Jan 2003 11:22:36 -0000
@@ -8,11 +8,14 @@
.include "Makefile.inc"
=20
# base sources
-SRCS+=3D cpt_err.c cryptlib.c cversion.c ebcdic.c ex_data.c mem.c mem_clr.=
c \
+SRCS=3D cpt_err.c cryptlib.c cversion.c ebcdic.c ex_data.c mem.c mem_clr.c=
\
mem_dbg.c o_time.c tmdiff.c uid.c
+INCS=3D crypto.h ebcdic.h opensslv.h ossl_typ.h symhacks.h tmdiff.h \
+ ../e_os.h ../e_os2.h
=20
# aes
SRCS+=3D aes_cbc.c aes_cfb.c aes_core.c aes_ctr.c aes_ecb.c aes_misc.c aes=
_ofb.c
+INCS+=3D aes.h aes_locl.h
=20
# asn1
SRCS+=3D a_bitstr.c a_bool.c a_bytes.c a_d2i_fp.c a_digest.c \
@@ -28,33 +31,41 @@
tasn_utl.c x_algor.c x_attrib.c x_bignum.c x_crl.c \
x_exten.c x_info.c x_long.c x_name.c x_pkey.c x_pubkey.c \
x_req.c x_sig.c x_spki.c x_val.c x_x509.c x_x509a.c
+INCS+=3D asn1.h asn1_mac.h asn1t.h
=20
# bf
SRCS+=3D bf_cfb64.c bf_ecb.c bf_enc.c bf_ofb64.c bf_skey.c
+INCS+=3D blowfish.h
=20
# bio
SRCS+=3D b_dump.c b_print.c b_sock.c bf_buff.c bf_lbuf.c bf_nbio.c \
bf_null.c bio_cb.c bio_err.c bio_lib.c bss_acpt.c bss_bio.c \
bss_conn.c bss_fd.c bss_file.c bss_log.c bss_mem.c \
bss_null.c bss_sock.c
+INCS+=3D bio.h
=20
# bn
SRCS+=3D bn_add.c bn_asm.c bn_blind.c bn_ctx.c bn_div.c bn_err.c bn_exp.c \
bn_exp2.c bn_gcd.c bn_kron.c bn_lib.c bn_mod.c bn_mont.c \
bn_mpi.c bn_mul.c bn_prime.c bn_print.c bn_rand.c bn_recp.c \
bn_shift.c bn_sqr.c bn_sqrt.c bn_word.c
+INCS+=3D bn.h
=20
# buffer
SRCS+=3D buf_err.c buffer.c
+INCS+=3D buffer.h
=20
# cast
SRCS+=3D c_cfb64.c c_ecb.c c_enc.c c_ofb64.c c_skey.c
+INCS+=3D cast.h
=20
# comp
SRCS+=3D c_rle.c c_zlib.c comp_err.c comp_lib.c
+INCS+=3D comp.h
=20
# conf
SRCS+=3D conf_api.c conf_def.c conf_err.c conf_lib.c conf_mall.c conf_mod.=
c conf_sap.c
+INCS+=3D conf.h conf_api.h
=20
# des
SRCS+=3D cbc3_enc.c cbc_cksm.c cbc_enc.c cfb64ede.c cfb64enc.c cfb_enc.c \
@@ -62,19 +73,24 @@
enc_read.c enc_writ.c fcrypt.c fcrypt_b.c ofb64ede.c ofb64enc.c \
ofb_enc.c pcbc_enc.c qud_cksm.c rand_key.c read2pwd.c \
rpc_enc.c set_key.c str2key.c xcbc_enc.c
+INCS+=3D des.h des_old.h
=20
# dh
SRCS+=3D dh_asn1.c dh_check.c dh_err.c dh_gen.c dh_key.c dh_lib.c
+INCS+=3D dh.h
=20
# dsa
SRCS+=3D dsa_asn1.c dsa_err.c dsa_gen.c dsa_key.c dsa_lib.c dsa_ossl.c dsa=
_sign.c dsa_vrf.c
+INCS+=3D dsa.h
=20
# dso
SRCS+=3D dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c dso_openssl.c
+INCS+=3D dso.h
=20
# ec
SRCS+=3D ec_cvt.c ec_err.c ec_lib.c ec_mult.c ecp_mont.c ecp_nist.c \
ecp_recp.c ecp_smpl.c
+INCS+=3D ec.h
=20
# engine
SRCS+=3D eng_all.c eng_cnf.c eng_ctrl.c eng_dyn.c eng_err.c eng_fat.c \
@@ -85,9 +101,13 @@
hw_nuron_err.c hw_sureware.c hw_sureware_err.c hw_ubsec.c \
hw_ubsec_err.c tb_cipher.c tb_dh.c tb_digest.c tb_dsa.c tb_rand.c \
tb_rsa.c
+INCS+=3D eng_int.h engine.h hw_4758_cca_err.h hw_aep_err.h hw_atalla_err.h=
\
+ hw_cswift_err.h hw_ncipher_err.h hw_nuron_err.h hw_sureware_err.h \
+ hw_ubsec_err.h
=20
# err
SRCS+=3D err.c err_all.c err_prn.c
+INCS+=3D err.h
=20
# evp
SRCS+=3D bio_b64.c bio_enc.c bio_md.c bio_ok.c c_all.c c_allc.c c_alld.c \
@@ -101,45 +121,57 @@
=20
# hmac
SRCS+=3D hmac.c
+INCS+=3D hmac.h
=20
# idea
.if defined(MAKE_IDEA) && ${MAKE_IDEA} =3D=3D YES
SRCS+=3D i_cbc.c i_cfb64.c i_ecb.c i_ofb64.c i_skey.c
+INCS+=3D idea.h
.endif
=20
# krb5
#SRCS+=3D krb5_asn.c
+INCS+=3D krb5_asn.h
=20
# lhash
SRCS+=3D lh_stats.c lhash.c
+INCS+=3D lhash.h
=20
# md2
SRCS+=3D md2_dgst.c md2_one.c
+INCS+=3D md2.h
=20
# md4
SRCS+=3D md4_dgst.c md4_one.c
+INCS+=3D md4.h
=20
# md5
SRCS+=3D md5_dgst.c md5_one.c
+INCS+=3D md5.h
=20
# mdc2
SRCS+=3D mdc2_one.c mdc2dgst.c
+INCS+=3D mdc2.h
=20
# objects
SRCS+=3D o_names.c obj_dat.c obj_err.c obj_lib.c
+INCS+=3D objects.h obj_mac.h
=20
# ocsp
SRCS+=3D ocsp_asn.c ocsp_cl.c ocsp_err.c ocsp_ext.c ocsp_ht.c \
ocsp_lib.c ocsp_prn.c ocsp_srv.c ocsp_vfy.c
+INCS+=3D ocsp.h
=20
# pem
SRCS+=3D pem_all.c pem_err.c pem_info.c pem_lib.c pem_oth.c pem_pk8.c \
pem_pkey.c pem_seal.c pem_sign.c pem_x509.c pem_xaux.c
+INCS+=3D pem.h pem2.h
=20
# pkcs12
SRCS+=3D p12_add.c p12_asn.c p12_attr.c p12_crpt.c p12_crt.c \
p12_decr.c p12_init.c p12_key.c p12_kiss.c p12_mutl.c \
p12_npas.c p12_p8d.c p12_p8e.c p12_utl.c pk12err.c
+INCS+=3D pkcs12.h pkcs7.h
=20
# pkcs7
SRCS+=3D example.c pk7_asn1.c pk7_attr.c pk7_dgst.c pk7_doit.c \
@@ -147,38 +179,48 @@
=20
# rand
SRCS+=3D md_rand.c rand_egd.c rand_err.c rand_lib.c rand_unix.c randfile.c
+INCS+=3D rand.h
=20
# rc2
SRCS+=3D rc2_cbc.c rc2_ecb.c rc2_skey.c rc2cfb64.c rc2ofb64.c
+INCS+=3D rc2.h
=20
# rc4
SRCS+=3D rc4_enc.c rc4_skey.c
+INCS+=3D rc4.h
=20
# rc5
SRCS+=3D rc5_ecb.c rc5_enc.c rc5_skey.c rc5cfb64.c rc5ofb64.c
+INCS+=3D rc5.h
=20
# ripemd
SRCS+=3D rmd_dgst.c rmd_one.c
+INCS+=3D ripemd.h
=20
# rsa
SRCS+=3D rsa_asn1.c rsa_chk.c rsa_eay.c rsa_err.c rsa_gen.c rsa_lib.c \
rsa_none.c rsa_null.c rsa_oaep.c rsa_pk1.c rsa_saos.c \
rsa_sign.c rsa_ssl.c
+INCS+=3D rsa.h
=20
# sha
SRCS+=3D sha1_one.c sha1dgst.c sha_dgst.c sha_one.c
+INCS+=3D sha.h
=20
# stack
SRCS+=3D stack.c
+INCS+=3D stack.h safestack.h
=20
# threads
SRCS+=3D th-lock.c
=20
# txt_db
SRCS+=3D txt_db.c
+INCS+=3D txt_db.h
=20
# ui
SRCS+=3D ui_compat.c ui_err.c ui_lib.c ui_openssl.c ui_util.c
+INCS+=3D ui.h ui_compat.h ui_locl.h
=20
# x509
SRCS+=3D by_dir.c by_file.c x509_att.c x509_cmp.c x509_d2.c \
@@ -186,15 +228,41 @@
x509_r2x.c x509_req.c x509_set.c x509_trs.c x509_txt.c \
x509_v3.c x509_vfy.c x509cset.c x509name.c x509rset.c \
x509spki.c x509type.c x_all.c
+INCS+=3D x509.h x509_vfy.h
=20
# x509v3
SRCS+=3D v3_akey.c v3_akeya.c v3_alt.c v3_bcons.c v3_bitst.c \
v3_conf.c v3_cpols.c v3_crld.c v3_enum.c v3_extku.c \
v3_genn.c v3_ia5.c v3_info.c v3_int.c v3_lib.c v3_ocsp.c \
v3_pku.c v3_prn.c v3_purp.c v3_skey.c v3_sxnet.c v3_utl.c v3err.c
+INCS+=3D x509v3.h
+
+SRCS+=3D buildinf.h
+INCS+=3D opensslconf.h evp.h
+INCSDIR=3D ${INCLUDEDIR}/openssl
+
+CLEANFILES=3D buildinf.h opensslconf.h evp.h
+
+buildinf.h:
+ ( echo "#ifndef MK1MF_BUILD"; \
+ echo " /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */=
"; \
+ echo " #define CFLAGS \"$(CC)\""; \
+ echo " #define PLATFORM \"`uname -s`-`uname -m`\""; \
+ echo " #define DATE \"`LC_ALL=3DC date`\""; \
+ echo "#endif" ) > ${.TARGET}
+
+opensslconf.h: opensslconf-${MACHINE_ARCH}.h
+ cp ${.ALLSRC} ${.TARGET}
+
+evp.h: ${LCRYPTO_SRC}/crypto/evp/evp.h
+.if !defined(MAKE_IDEA) || ${MAKE_IDEA} !=3D YES
+ sed '/^#ifndef OPENSSL_NO_IDEA$$/,/^#endif$$/d' ${.ALLSRC} > ${.TARGET}
+.else
+ cp ${.ALLSRC} ${.TARGET}
+.endif
=20
.if defined(WANT_OPENSSL_MANPAGES)
-MAN3=3D ASN1_OBJECT_new.3 ASN1_STRING_length.3 ASN1_STRING_new.3 \
+MAN=3D ASN1_OBJECT_new.3 ASN1_STRING_length.3 ASN1_STRING_new.3 \
ASN1_STRING_print_ex.3 BIO_ctrl.3 BIO_f_base64.3 BIO_f_buffer.3 \
BIO_f_cipher.3 BIO_f_md.3 BIO_f_null.3 BIO_f_ssl.3 BIO_find_type.3 \
BIO_new.3 BIO_push.3 BIO_read.3 BIO_s_accept.3 BIO_s_bio.3 \
@@ -232,9 +300,6 @@
lh_stats.3 lhash.3 md5.3 mdc2.3 pem.3 rand.3 rc4.3 ripemd.3 \
rsa.3 sha.3 threads.3 ui.3 ui_compat.3
.endif
-
-INCS=3D ${HDRS} openssl/evp.h openssl/opensslconf.h
-INCSDIR=3D ${INCLUDEDIR}/openssl
=20
.include <bsd.lib.mk>
=20
Index: Makefile.inc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/src/secure/lib/libcrypto/Makefile.inc,v
retrieving revision 1.31
diff -u -r1.31 Makefile.inc
--- Makefile.inc 29 Jan 2003 02:19:15 -0000 1.31
+++ Makefile.inc 31 Jan 2003 11:22:36 -0000
@@ -8,8 +8,6 @@
=20
.if !defined(MAKE_IDEA) || ${MAKE_IDEA} !=3D YES
CFLAGS+=3D -DOPENSSL_NO_IDEA
-.else
-_idea_h=3D idea/idea.h
.endif
=20
.if ${MACHINE_ARCH} =3D=3D "i386"
@@ -17,86 +15,6 @@
.elif ${MACHINE_ARCH} =3D=3D "alpha"
# no ENDIAN stuff defined for alpha (64-bit)
.endif
-
-HDRS+=3D \
- ../e_os.h ../e_os2.h \
- crypto.h \
- ebcdic.h \
- opensslv.h \
- ossl_typ.h \
- symhacks.h \
- tmdiff.h \
- aes/aes.h aes/aes_locl.h \
- asn1/asn1.h asn1/asn1_mac.h asn1/asn1t.h \
- bio/bio.h \
- bf/blowfish.h \
- bn/bn.h \
- buffer/buffer.h \
- cast/cast.h \
- comp/comp.h \
- conf/conf.h conf/conf_api.h \
- des/des.h des/des_old.h \
- dh/dh.h \
- dsa/dsa.h \
- dso/dso.h \
- ec/ec.h \
- engine/eng_int.h engine/engine.h engine/hw_4758_cca_err.h \
- engine/hw_aep_err.h engine/hw_atalla_err.h engine/hw_cswift_err.h \
- engine/hw_ncipher_err.h engine/hw_nuron_err.h engine/hw_sureware_err.h \
- engine/hw_ubsec_err.h \
- err/err.h \
- hmac/hmac.h \
- ${_idea_h} \
- krb5/krb5_asn.h \
- lhash/lhash.h \
- md2/md2.h \
- md4/md4.h \
- md5/md5.h \
- mdc2/mdc2.h \
- ocsp/ocsp.h \
- objects/objects.h objects/obj_mac.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/stack.h stack/safestack.h \
- sha/sha.h \
- txt_db/txt_db.h \
- ui/ui.h ui/ui_compat.h ui/ui_locl.h \
- x509/x509.h x509/x509_vfy.h x509v3/x509v3.h
-
-SRCS+=3D buildinf.h openssl/opensslconf.h openssl/evp.h
-CLEANFILES+=3D buildinf.h openssl/opensslconf.h openssl/evp.h
-CLEANDIRS+=3D openssl
-
-buildinf.h:
- ( echo "#ifndef MK1MF_BUILD"; \
- echo " /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */=
"; \
- echo " #define CFLAGS \"$(CC)\""; \
- echo " #define PLATFORM \"`uname -s`-`uname -m`\""; \
- echo " #define DATE \"`LC_ALL=3DC date`\""; \
- echo "#endif" ) > ${.TARGET}
-
-openssl/opensslconf.h: ../../lib/libcrypto/opensslconf-${MACHINE_ARCH}.h
- mkdir -p openssl
- cp ${.OODATE} ${.TARGET}
-
-openssl/evp.h: ${LCRYPTO_SRC}/crypto/evp/evp.h
- mkdir -p openssl
-.if !defined(MAKE_IDEA) || ${MAKE_IDEA} !=3D YES
- sed '/^#ifndef OPENSSL_NO_IDEA$$/,/^#endif$$/d' ${.OODATE} > ${.TARGET}
-.else
- ${INSTALL} -C -m 444 ${.OODATE} ${.TARGET}
-.endif
-
-SRCS+=3D ${HDRS:T:S;^;openssl/;}
-.for h in ${HDRS:S/^/${LCRYPTO_SRC}\/crypto\//}
-openssl/${h:T}: ${h}
- mkdir -p openssl
- ${INSTALL} -C -m 444 ${h} openssl
-.endfor
=20
man-update:
for i in `( cd ${LCRYPTO_DOC}/${LIB}${PROG} ; ls *.pod )` ; do \
--Pd0ReVV5GZGQvF3a--
--H8ygTp4AXg6deix2
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD8DBQE+OlzZUkv4P6juNwoRAkLnAJ44WIgSr8gPA08QyGw59B2xdYnb9gCfV29T
enMiQsyNin4jNyv98aTNvlM=
=C4t5
-----END PGP SIGNATURE-----
--H8ygTp4AXg6deix2--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030131112409.GB51054>