diff options
author | Richard Levitte <levitte@openssl.org> | 2019-02-12 11:37:43 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-02-13 04:47:11 +0100 |
commit | 5674466e007d892ec55441059b3763abd5dd5440 (patch) | |
tree | 00168bff4d96171d868d9a06eddc99d2f6932d6d /apps/build.info | |
parent | 7f4268bff3cf49b96d25bfd83013ee310c31520b (diff) |
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h.
Some compilers do all inclusions from the directory of the C file
being compiled, so when a C file includes a header file with a
relative file spec, and that header file also includes another header
file with a relative file spec, the compiler no longer follows.
As a specific example, test/testutil/basic_output.c included
../testutil.h. Fine so far, but then, test/testutil.h includes
../apps/opt.h, and the compiler ends up trying to include (seen from
the source top) test/apps/opt.h rather than apps/opt.h, and fails.
The solution could have been to simply add apps/ as an inclusion
directory. However, that directory also has header files that have
nothing to do with libapps, so we take this a bit further, create
apps/include and move libapps specific headers there, and then add
apps/include as inclusion directory in the build.info files where
needed.
Reviewed-by: Paul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/8210)
Diffstat (limited to 'apps/build.info')
-rw-r--r-- | apps/build.info | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/build.info b/apps/build.info index 7a5e8762db..9b77c469f5 100644 --- a/apps/build.info +++ b/apps/build.info @@ -15,12 +15,12 @@ IF[{- !$disabled{apps} -}] LIBS{noinst}=libapps.a SOURCE[libapps.a]={- join(" ", @apps_lib_src) -} - INCLUDE[libapps.a]=.. ../include + INCLUDE[libapps.a]=.. ../include include PROGRAMS=openssl SOURCE[openssl]={- join(" ", @apps_init_src) -} SOURCE[openssl]={- join(" ", @apps_openssl_src) -} - INCLUDE[openssl]=.. ../include + INCLUDE[openssl]=.. ../include include DEPEND[openssl]=libapps.a ../libssl IF[{- $config{target} =~ /^(?:Cygwin|mingw|VC-)/ -}] |