From: Richard Levitte Date: Thu, 4 Feb 2021 11:58:35 +0000 (+0100) Subject: DOCS: Remove the "global" dependency on writing .pod files from .pod.in X-Git-Tag: openssl-3.0.0-alpha12~121 X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=b8393eae224d11276323957fcd493953d5b135b9 DOCS: Remove the "global" dependency on writing .pod files from .pod.in The dependency was made in such a way that .pod.in -> .pod generation would always be done, no matter what. This changes the procedure so that the generation is made "on demand", i.e. when the resulting .pod files are needed. This turned out to be duplicated dependencies, as the .pod -> .pod.in dependencies were already in place. Just removing the duplicate fixes the situation. 'make build_all_generated' still works, for those who do want to have all file generations performed. (as a reminder, this is suitable to generate the files a fast system and then copy the result to a slower system, or system where there's no perl) Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/14067) --- diff --git a/build.info b/build.info index 27818b7fce..053329c682 100644 --- a/build.info +++ b/build.info @@ -38,8 +38,7 @@ DEPEND[]=include/openssl/asn1.h \ include/openssl/x509.h \ include/openssl/x509v3.h \ include/openssl/x509_vfy.h \ - include/crypto/bn_conf.h include/crypto/dso_conf.h \ - doc/man7/openssl_user_macros.pod + include/crypto/bn_conf.h include/crypto/dso_conf.h GENERATE[include/openssl/asn1.h]=include/openssl/asn1.h.in GENERATE[include/openssl/asn1t.h]=include/openssl/asn1t.h.in diff --git a/doc/man1/build.info b/doc/man1/build.info index 6d9d7b564c..b796fce42f 100644 --- a/doc/man1/build.info +++ b/doc/man1/build.info @@ -1,58 +1,6 @@ - -DEPEND[]= \ - openssl-asn1parse.pod \ - openssl-ca.pod \ - openssl-ciphers.pod \ - openssl-cmds.pod \ - openssl-cmp.pod \ - openssl-cms.pod \ - openssl-crl2pkcs7.pod \ - openssl-crl.pod \ - openssl-dgst.pod \ - openssl-dhparam.pod \ - openssl-dsaparam.pod \ - openssl-dsa.pod \ - openssl-ecparam.pod \ - openssl-ec.pod \ - openssl-enc.pod \ - openssl-engine.pod \ - openssl-errstr.pod \ - openssl-fipsinstall.pod \ - openssl-gendsa.pod \ - openssl-genpkey.pod \ - openssl-genrsa.pod \ - openssl-info.pod \ - openssl-kdf.pod \ - openssl-list.pod \ - openssl-mac.pod \ - openssl-nseq.pod \ - openssl-ocsp.pod \ - openssl-passwd.pod \ - openssl-pkcs12.pod \ - openssl-pkcs7.pod \ - openssl-pkcs8.pod \ - openssl-pkeyparam.pod \ - openssl-pkey.pod \ - openssl-pkeyutl.pod \ - openssl-prime.pod \ - openssl-rand.pod \ - openssl-rehash.pod \ - openssl-req.pod \ - openssl-rsa.pod \ - openssl-rsautl.pod \ - openssl-s_client.pod \ - openssl-sess_id.pod \ - openssl-smime.pod \ - openssl-speed.pod \ - openssl-spkac.pod \ - openssl-srp.pod \ - openssl-s_server.pod \ - openssl-s_time.pod \ - openssl-storeutl.pod \ - openssl-ts.pod \ - openssl-verify.pod \ - openssl-version.pod \ - openssl-x509.pod +# All .pod.in files are detected by build.info in the parent directory, and +# turned into appropriate DEPEND and GENERATE lines. All we need here are +# the additional dependencies on ../perlvars.pm. DEPEND[openssl-asn1parse.pod]=../perlvars.pm DEPEND[openssl-ca.pod]=../perlvars.pm @@ -107,6 +55,3 @@ DEPEND[openssl-ts.pod]=../perlvars.pm DEPEND[openssl-verify.pod]=../perlvars.pm DEPEND[openssl-version.pod]=../perlvars.pm DEPEND[openssl-x509.pod]=../perlvars.pm - -# All .pod.in files are detected by build.info in the parent directory, and -# turned into appropriate GENERATE lines.