diff options
author | Richard Levitte <levitte@openssl.org> | 2019-06-16 12:56:21 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-06-17 16:08:52 +0200 |
commit | 989b2ad786ee43438bbb8b33f857ba0ce6e10082 (patch) | |
tree | c151998c5fa3114d713ec4b6e649502f9cfb3dcc /apps | |
parent | b19fe714e9d4c50dcb33259346f06d3924b337b7 (diff) |
Move uplink file information to build.info files
This file information was hidden in config target files, when they
should really be part of build.info like any other file we build
from. With build.info variables, the task became much easier.
We take the opportunity to move apps_init_src and apps_aux_src to
apps/build.info as well, and to clean up apps/build.info.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9166)
Diffstat (limited to 'apps')
-rw-r--r-- | apps/build.info | 49 |
1 files changed, 34 insertions, 15 deletions
diff --git a/apps/build.info b/apps/build.info index cbb70fc78a..3b4ea25d6b 100644 --- a/apps/build.info +++ b/apps/build.info @@ -1,4 +1,25 @@ -{- our @apps_openssl_src = +# Program init source, that don't have direct linkage with the rest of the +# source, and can therefore not be part of a library. +IF[{- !$disabled{uplink} -}] + $INITSRC=../ms/applink.c +ENDIF +IF[{- $config{target} =~ /^vms-/ -}] + $INITSRC=vms_decc_init.c +ENDIF + +# Auxilliary program source +IF[{- $config{target} =~ /^(?:VC-|mingw)/ -}] + # It's called 'init', but doesn't have much 'init' in it... + $AUXLIBAPPSSRC=win32_init.c +ENDIF +IF[{- $config{target} =~ /^vms-/ -}] + $AUXLIBAPPSSRC=vms_term_sock.c vms_decc_argv.c +ENDIF + +# Source for the 'openssl' program +# We need the perl variable for the DEPEND generator further down. +$OPENSSLSRC={- + our @opensslsrc = qw(openssl.c asn1pars.c ca.c ciphers.c cms.c crl.c crl2p7.c dgst.c dhparam.c dsa.c dsaparam.c ec.c ecparam.c enc.c engine.c errstr.c gendsa.c @@ -7,30 +28,28 @@ rsautl.c 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 info.c); - our @apps_lib_src = - ( qw(apps.c apps_ui.c opt.c fmt.c s_cb.c s_socket.c app_rand.c - bf_prefix.c), - split(/\s+/, $target{apps_aux_src}) ); - our @apps_init_src = split(/\s+/, $target{apps_init_src}); - "" -} + join(' ', @opensslsrc); -} +# Source for libapps +$LIBAPPSSRC=apps.c apps_ui.c opt.c fmt.c s_cb.c s_socket.c app_rand.c \ + bf_prefix.c + IF[{- !$disabled{apps} -}] LIBS{noinst}=libapps.a - SOURCE[libapps.a]={- join(" ", @apps_lib_src) -} + SOURCE[libapps.a]=$LIBAPPSSRC $AUXLIBAPPSSRC INCLUDE[libapps.a]=.. ../include include PROGRAMS=openssl - SOURCE[openssl]={- join(" ", @apps_init_src) -} - SOURCE[openssl]={- join(" ", @apps_openssl_src) -} + SOURCE[openssl]=$INITSRC $OPENSSLSRC INCLUDE[openssl]=.. ../include include DEPEND[openssl]=libapps.a ../libssl -IF[{- $config{target} =~ /^(?:Cygwin|mingw|VC-)/ -}] - GENERATE[openssl.rc]=../util/mkrc.pl openssl - SOURCE[openssl]=openssl.rc -ENDIF + IF[{- $config{target} =~ /^(?:Cygwin|mingw|VC-)/ -}] + GENERATE[openssl.rc]=../util/mkrc.pl openssl + SOURCE[openssl]=openssl.rc + ENDIF {- join("\n ", map { (my $x = $_) =~ s|\.c$|.o|; "DEPEND[$x]=progs.h" } - @apps_openssl_src) -} + @opensslsrc) -} GENERATE[progs.h]=progs.pl $(APPS_OPENSSL) DEPEND[progs.h]=../configdata.pm |