diff options
author | Richard Levitte <levitte@openssl.org> | 2019-10-04 15:37:14 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2019-10-10 14:12:15 +0200 |
commit | 600703f4f4d4bbe7016a8704a0f2195e370648c0 (patch) | |
tree | 5212387130f6d6f7aaa1becffad2e1129e1a7fba /providers/build.info | |
parent | ddd21319e94636f308e115fd05cc48e7a8eadc55 (diff) |
Cleanup: move provider mains up
providers/default/defltprov.c and providers/legacy/legacyprov.c
are moved up to providers/ and providers/build.info is adjusted
accordingly.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10088)
Diffstat (limited to 'providers/build.info')
-rw-r--r-- | providers/build.info | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/providers/build.info b/providers/build.info index 42b9c0aa9c..c31c4271de 100644 --- a/providers/build.info +++ b/providers/build.info @@ -28,7 +28,7 @@ # FIPS_MODE undefined. The default and legacy # providers use this. -SUBDIRS=common default implementations +SUBDIRS=common implementations INCLUDE[../libcrypto]=common/include @@ -82,6 +82,7 @@ LIBS{noinst}=$LIBNONFIPS $LIBIMPLEMENTATIONS # with DEPEND. $DEFAULTGOAL=../libcrypto SOURCE[$DEFAULTGOAL]=$LIBIMPLEMENTATIONS $LIBNONFIPS +SOURCE[$DEFAULTGOAL]=defltprov.c # Some legacy implementations depend on provider header files INCLUDE[../libcrypto]=implementations/include @@ -117,7 +118,6 @@ ENDIF # IF[{- !$disabled{legacy} -}] # The legacy implementation library - SUBDIRS=legacy LIBS{noinst}=$LIBLEGACY DEPEND[$LIBLEGACY]=$LIBCOMMON $LIBNONFIPS @@ -147,6 +147,6 @@ IF[{- !$disabled{legacy} -}] # Common things that are valid no matter what form the Legacy provider # takes. - INCLUDE[$LEGACYGOAL]=../include common/include + SOURCE[$LEGACYGOAL]=legacyprov.c + INCLUDE[$LEGACYGOAL]=../include implementations/include ENDIF - |