diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-02-26 14:39:16 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-03-02 03:34:30 +0100 |
| commit | a3f1fc25017ef768a956b88edee4aaf851a58db2 (patch) | |
| tree | ae8dbfa1e97ac3c6ea9ad77fe6bffa3fbe7f0648 /apps/build.info | |
| parent | e42921790267d54054cde1596711219b72a184ad (diff) | |
Build: Generate apps/progs.c and apps/progs.h in build time
util/progs.pl depends on the build tree (on configdata.pm,
specifically), so it needs to be run from the build tree. But why
stop there? We might as well generate apps/progs.c and apps/progs.h
when building.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11185)
Diffstat (limited to 'apps/build.info')
| -rw-r--r-- | apps/build.info | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/apps/build.info b/apps/build.info index 1b931c8ac1..495e56065e 100644 --- a/apps/build.info +++ b/apps/build.info @@ -19,6 +19,10 @@ $OPENSSLSRC=\ s_client.c s_server.c s_time.c sess_id.c smime.c speed.c \ spkac.c srp.c ts.c verify.c version.c x509.c rehash.c storeutl.c \ list.c info.c provider.c fipsinstall.c +IF[{- !$disabled{'deprecated-3.0'} -}] + $OPENSSLSRC=$OPENSSLSRC \ + dhparam.c dsa.c dsaparam.c gendsa.c rsa.c rsautl.c genrsa.c +ENDIF IF[{- !$disabled{apps} -}] PROGRAMS=openssl @@ -26,15 +30,18 @@ IF[{- !$disabled{apps} -}] INCLUDE[openssl]=.. ../include include DEPEND[openssl]=libapps.a ../libssl + DEPEND[${OPENSSLSRC/.c/.o}]=progs.h + GENERATE[progs.c]=progs.pl -C $(APPS_OPENSSL) + GENERATE[progs.h]=progs.pl -H $(APPS_OPENSSL) + # progs.pl tries to read all 'openssl' sources, including progs.c, so we make + # sure things are generated in the correct order. + DEPEND[progs.h]=progs.c + IF[{- $config{target} =~ /^(?:Cygwin|mingw|VC-)/ -}] GENERATE[openssl.rc]=../util/mkrc.pl openssl SOURCE[openssl]=openssl.rc ENDIF - IF[{- !$disabled{'deprecated-3.0'} -}] - SOURCE[openssl]=dhparam.c dsa.c dsaparam.c gendsa.c rsa.c rsautl.c genrsa.c - ENDIF - SCRIPTS{misc}=CA.pl SOURCE[CA.pl]=CA.pl.in # linkname tells build files that a symbolic link or copy of this script |