diff options
author | Richard Levitte <levitte@openssl.org> | 2019-08-28 22:27:47 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-09-04 17:26:07 +0200 |
commit | 2ad75c6c1341db8a3122bbeaf863440057d71307 (patch) | |
tree | fbcb1a16b4410414083f21ddaa92aa8e450a0baa /test | |
parent | 1e8e75d18be8856e753a57771754b9926c3f4264 (diff) | |
download | openssl-2ad75c6c1341db8a3122bbeaf863440057d71307.tar.gz |
Move libapps.a source to apps/lib
This makes it clearer what's what. The 'openssl' application and its
sub-commands remain in apps/
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/9723)
Diffstat (limited to 'test')
-rw-r--r-- | test/build.info | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/test/build.info b/test/build.info index 595a0da2ae..eb344fd6c3 100644 --- a/test/build.info +++ b/test/build.info @@ -1,19 +1,20 @@ SUBDIRS=ossl_shim -# TODO: use ../apps/libapps.a instead of direct ../apps source. +# TODO: use ../apps/libapps.a instead of direct ../apps/lib source. # This can't currently be done, because some of its units drag in too many -# unresolved references that don't apply here. Most of all, ../apps/apps.c -# needs to be divided in smaller pieces to be useful here. +# unresolved references that don't apply here. +# Most of all, ../apps/lib/apps.c needs to be divided in smaller pieces to +# be useful here. # # Auxilliary program source (copied from ../apps/build.info) IF[{- $config{target} =~ /^(?:VC-|mingw)/ -}] # It's called 'init', but doesn't have much 'init' in it... - $AUXLIBAPPSSRC=../apps/win32_init.c + $AUXLIBAPPSSRC=../apps/lib/win32_init.c ENDIF IF[{- $config{target} =~ /^vms-/ -}] - $AUXLIBAPPSSRC=../apps/vms_term_sock.c ../apps/vms_decc_argv.c + $AUXLIBAPPSSRC=../apps/lib/vms_term_sock.c ../apps/lib/vms_decc_argv.c ENDIF -$LIBAPPSSRC=../apps/opt.c ../apps/bf_prefix.c $AUXLIBAPPSSRC +$LIBAPPSSRC=../apps/lib/opt.c ../apps/lib/bf_prefix.c $AUXLIBAPPSSRC IF[{- !$disabled{tests} -}] LIBS{noinst,has_main}=libtestutil.a @@ -435,7 +436,7 @@ IF[{- !$disabled{tests} -}] DEPEND[cipher_overhead_test]=../libcrypto ../libssl libtestutil.a ENDIF - SOURCE[uitest]=uitest.c ../apps/apps_ui.c + SOURCE[uitest]=uitest.c ../apps/lib/apps_ui.c INCLUDE[uitest]=.. ../include ../apps/include DEPEND[uitest]=../libcrypto ../libssl libtestutil.a |