diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-12-03 19:41:05 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-12-11 12:55:48 +0100 |
| commit | 68a51d59a29796803af3b6e7f0142feca2622c9e (patch) | |
| tree | 1c67dea0b89826473f0cfe64ea548019ffec35c0 /providers/build.info | |
| parent | 436c21a0fd317cb929fb00eefb1ac84e90676097 (diff) | |
Move providers/common/{ciphers,digests}/* to providers/implementations
The idea to have all these things in providers/common was viable as
long as the implementations was spread around their main providers.
This is, however, no longer the case, so we move the common blocks
closer to the source that use them.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10564)
Diffstat (limited to 'providers/build.info')
| -rw-r--r-- | providers/build.info | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/providers/build.info b/providers/build.info index c31c4271de..39e767fb0e 100644 --- a/providers/build.info +++ b/providers/build.info @@ -40,14 +40,14 @@ $LIBNONFIPS=libnonfips.a $LIBFIPS=libfips.a # Enough of our implementations include prov/ciphercommon.h (present in -# providers/common/include), which includes crypto/ciphermode_platform.h +# providers/implementations/include), which includes crypto/ciphermode_platform.h # (present in include), which in turn may include very internal header # files in crypto/, so let's have a common include list for them all. -$COMMON_INCLUDES=../crypto ../include common/include +$COMMON_INCLUDES=../crypto ../include implementations/include common/include INCLUDE[$LIBCOMMON]=$COMMON_INCLUDES -INCLUDE[$LIBIMPLEMENTATIONS]=.. $COMMON_INCLUDES implementations/include -INCLUDE[$LIBLEGACY]=$COMMON_INCLUDES implementations/include +INCLUDE[$LIBIMPLEMENTATIONS]=.. $COMMON_INCLUDES +INCLUDE[$LIBLEGACY]=$COMMON_INCLUDES INCLUDE[$LIBNONFIPS]=$COMMON_INCLUDES INCLUDE[$LIBFIPS]=.. $COMMON_INCLUDES DEFINE[$LIBFIPS]=FIPS_MODE @@ -84,7 +84,7 @@ $DEFAULTGOAL=../libcrypto SOURCE[$DEFAULTGOAL]=$LIBIMPLEMENTATIONS $LIBNONFIPS SOURCE[$DEFAULTGOAL]=defltprov.c # Some legacy implementations depend on provider header files -INCLUDE[../libcrypto]=implementations/include +INCLUDE[$DEFAULTGOAL]=implementations/include LIBS=$DEFAULTGOAL |