Skip to content

Commit 1c684dc

Browse files
gpercivacperciva
authored andcommitted
Makefile.am: fix name & style for crypto_aes.a
This should have been part of: 2024-04-08 apisupport: add & use LIBCRYPTO-LOW_LEVEL_AES 329439f This library only uses libcperciva code, so it should be libcperciva_*, not libscrypt_*. Also, we don't crypto_aes.h in _SOURCES. And we want to recompile this if cpusupport-config.h was modified.
1 parent 818733a commit 1c684dc

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

Makefile.am

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ scrypt_LDADD= \
107107
libcperciva_shani.la \
108108
libscrypt_sse2.la \
109109
libscrypt_memlimit.la \
110-
libscrypt_crypto_aes.la \
110+
libcperciva_crypto_aes.la \
111111
libcperciva_arm_sha256.la \
112112
libcperciva_arm_aes.la \
113113
${LDADD_POSIX}
@@ -159,6 +159,11 @@ libcperciva_arm_sha256_la_SOURCES= libcperciva/alg/sha256_arm.c
159159
nodist_libcperciva_arm_sha256_la_SOURCES= cpusupport-config.h
160160
libcperciva_arm_sha256_la_CFLAGS=`. ./cpusupport-config.h; echo $${CFLAGS_ARM_SHA256}`
161161

162+
noinst_LTLIBRARIES+= libcperciva_crypto_aes.la
163+
libcperciva_crypto_aes_la_SOURCES= libcperciva/crypto/crypto_aes.c
164+
nodist_libcperciva_crypto_aes_la_SOURCES= cpusupport-config.h
165+
libcperciva_crypto_aes_la_CFLAGS=`. ./apisupport-config.h; echo $${CFLAGS_LIBCRYPTO_LOW_LEVEL_AES}`
166+
162167
# Library from libcperciva and scrypt code.
163168
noinst_LTLIBRARIES+= libscrypt_sse2.la
164169
libscrypt_sse2_la_SOURCES= \
@@ -175,12 +180,6 @@ libscrypt_memlimit_la_SOURCES= \
175180
lib-platform/util/memlimit.h
176181
libscrypt_memlimit_la_CFLAGS=`. ./apisupport-config.h; echo $${CFLAGS_NONPOSIX_MEMLIMIT}`
177182

178-
noinst_LTLIBRARIES+= libscrypt_crypto_aes.la
179-
libscrypt_crypto_aes_la_SOURCES= \
180-
libcperciva/crypto/crypto_aes.c \
181-
libcperciva/crypto/crypto_aes.h
182-
libscrypt_crypto_aes_la_CFLAGS=`. ./apisupport-config.h; echo $${CFLAGS_LIBCRYPTO_LOW_LEVEL_AES}`
183-
184183
# Install libscrypt-kdf?
185184
if LIBSCRYPT_KDF
186185
lib_LTLIBRARIES= libscrypt-kdf.la

0 commit comments

Comments
 (0)