mirror of
https://github.com/openssl/openssl.git
synced 2024-12-09 05:51:54 +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)
38 lines
1.4 KiB
Plaintext
38 lines
1.4 KiB
Plaintext
# Note that some of these directories are filtered in Configure. Look for
|
|
# %skipdir there for further explanations.
|
|
SUBDIRS=crypto ssl apps test util tools fuzz engines providers
|
|
|
|
LIBS=libcrypto libssl
|
|
INCLUDE[libcrypto]=. include
|
|
INCLUDE[libssl]=. include
|
|
DEPEND[libssl]=libcrypto
|
|
|
|
# Empty DEPEND "indices" means the dependencies are expected to be built
|
|
# unconditionally before anything else.
|
|
DEPEND[]=include/openssl/opensslconf.h include/crypto/bn_conf.h \
|
|
include/crypto/dso_conf.h doc/man7/openssl_user_macros.pod
|
|
DEPEND[include/openssl/opensslconf.h]=configdata.pm
|
|
GENERATE[include/openssl/opensslconf.h]=include/openssl/opensslconf.h.in
|
|
DEPEND[include/crypto/bn_conf.h]=configdata.pm
|
|
GENERATE[include/crypto/bn_conf.h]=include/crypto/bn_conf.h.in
|
|
DEPEND[include/crypto/dso_conf.h]=configdata.pm
|
|
GENERATE[include/crypto/dso_conf.h]=include/crypto/dso_conf.h.in
|
|
DEPEND[doc/man7/openssl_user_macros.pod]=configdata.pm
|
|
GENERATE[doc/man7/openssl_user_macros.pod]=doc/man7/openssl_user_macros.pod.in
|
|
|
|
IF[{- defined $target{shared_defflag} -}]
|
|
SHARED_SOURCE[libcrypto]=libcrypto.ld
|
|
SHARED_SOURCE[libssl]=libssl.ld
|
|
|
|
GENERATE[libcrypto.ld]=util/libcrypto.num libcrypto
|
|
GENERATE[libssl.ld]=util/libssl.num libssl
|
|
ENDIF
|
|
|
|
IF[{- $config{target} =~ /^(?:Cygwin|mingw|VC-)/ -}]
|
|
GENERATE[libcrypto.rc]=util/mkrc.pl libcrypto
|
|
GENERATE[libssl.rc]=util/mkrc.pl libssl
|
|
|
|
SHARED_SOURCE[libcrypto]=libcrypto.rc
|
|
SHARED_SOURCE[libssl]=libssl.rc
|
|
ENDIF
|