# Note that these directories are filtered in Configure. Look for %skipdir
# there for further explanations.
-SUBDIRS=objects buffer bio stack lhash rand evp asn1 pem x509 x509v3 conf \
+SUBDIRS=objects buffer bio stack lhash rand evp asn1 pem x509 conf \
txt_db pkcs7 pkcs12 ui kdf store property \
md2 md4 md5 sha mdc2 gmac hmac ripemd whrlpool poly1305 blake2 \
siphash sm3 des aes rc2 rc4 rc5 idea aria bf cast camellia \
seed sm4 chacha modes bn ec rsa dsa dh sm2 dso engine \
- err comp ocsp cms ts srp cmac ct async kmac ess crmf
+ err comp ocsp cms ts srp cmac ct async kmac ess crmf cmp
LIBS=../libcrypto
# The Core
-SOURCE[../libcrypto]=provider_core.c provider_predefined.c provider_conf.c \
- core_fetch.c
+$CORE_COMMON=provider_core.c provider_predefined.c core_fetch.c core_namemap.c
+
+SOURCE[../libcrypto]=$CORE_COMMON provider_conf.c
+SOURCE[../providers/fips]=$CORE_COMMON
# Central utilities
-SOURCE[../libcrypto]=\
- cryptlib.c mem.c mem_dbg.c cversion.c info.c ex_data.c cpt_err.c \
- ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fopen.c ctype.c \
- threads_pthread.c threads_win.c threads_none.c getenv.c \
- o_init.c o_fips.c mem_sec.c init.c context.c sparse_array.c \
- trace.c provider.c params.c bsearch.c \
- {- $target{cpuid_asm_src} -} {- $target{uplink_aux_src} -}
-
-# FIPS module
-SOURCE[../providers/fips]=\
- cryptlib.c mem.c mem_clr.c params.c bsearch.c
+$UTIL_COMMON=\
+ cryptlib.c mem.c mem_sec.c params.c bsearch.c ex_data.c o_str.c \
+ ctype.c threads_pthread.c threads_win.c threads_none.c context.c \
+ sparse_array.c {- $target{cpuid_asm_src} -}
+
+SOURCE[../libcrypto]=$UTIL_COMMON \
+ mem_dbg.c cversion.c info.c cpt_err.c ebcdic.c uid.c o_time.c o_dir.c \
+ o_fopen.c getenv.c o_init.c o_fips.c init.c trace.c provider.c \
+ {- $target{uplink_aux_src} -}
+SOURCE[../providers/fips]=$UTIL_COMMON
+
DEPEND[cversion.o]=buildinf.h