mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
25f2138b0a
Currently, there are two different directories which contain internal header files of libcrypto which are meant to be shared internally: While header files in 'include/internal' are intended to be shared between libcrypto and libssl, the files in 'crypto/include/internal' are intended to be shared inside libcrypto only. To make things complicated, the include search path is set up in such a way that the directive #include "internal/file.h" could refer to a file in either of these two directoroes. This makes it necessary in some cases to add a '_int.h' suffix to some files to resolve this ambiguity: #include "internal/file.h" # located in 'include/internal' #include "internal/file_int.h" # located in 'crypto/include/internal' This commit moves the private crypto headers from 'crypto/include/internal' to 'include/crypto' As a result, the include directives become unambiguous #include "internal/file.h" # located in 'include/internal' #include "crypto/file.h" # located in 'include/crypto' hence the superfluous '_int.h' suffixes can be stripped. The files 'store_int.h' and 'store.h' need to be treated specially; they are joined into a single file. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9333)
31 lines
710 B
Plaintext
31 lines
710 B
Plaintext
SUBDIRS=common default
|
|
|
|
INCLUDE[../libcrypto]=common/include
|
|
|
|
IF[{- !$disabled{fips} -}]
|
|
SUBDIRS=fips
|
|
MODULES=fips
|
|
IF[{- defined $target{shared_defflag} -}]
|
|
SOURCE[fips]=fips.ld
|
|
GENERATE[fips.ld]=../util/providers.num
|
|
ENDIF
|
|
INCLUDE[fips]=.. ../include common/include
|
|
DEFINE[fips]=FIPS_MODE
|
|
ENDIF
|
|
|
|
IF[{- !$disabled{legacy} -}]
|
|
SUBDIRS=legacy
|
|
IF[{- $disabled{module} -}]
|
|
LIBS=../libcrypto
|
|
DEFINE[../libcrypto]=STATIC_LEGACY
|
|
ELSE
|
|
MODULES=legacy
|
|
IF[{- defined $target{shared_defflag} -}]
|
|
SOURCE[legacy]=legacy.ld
|
|
GENERATE[legacy.ld]=../util/providers.num
|
|
ENDIF
|
|
DEPEND[legacy]=../libcrypto
|
|
INCLUDE[legacy]=.. ../include common/include
|
|
ENDIF
|
|
ENDIF
|