Skip to content

Makefile.am: sort lists #398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cperciva merged 2 commits into from
Feb 4, 2025
Merged

Makefile.am: sort lists #398

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12726b6
Makefile.am: add libcperciva_cpusupport_detect.la
gperciva Feb 2, 2025
86bb518
Makefile.am: sort lists
gperciva Feb 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 43 additions & 35 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
bin_PROGRAMS= scrypt
noinst_PROGRAMS= \
tests/verify-strings/test_scrypt \
tests/valgrind/potential-memleaks
tests/valgrind/potential-memleaks \
tests/verify-strings/test_scrypt
dist_man_MANS=$(scrypt_man_MANS)
ACLOCAL_AMFLAGS= -I m4

Expand All @@ -10,29 +10,19 @@ ACLOCAL_AMFLAGS= -I m4
# lib/crypto/crypto_scrypt_smix_sse2.c
# which require special compiler flags and are thus compiled as separate
# libraries. See test_scrypt for an example.
#
# crypto_scrypt() does not require aesni or rdrand, but we need to include
# the relevant cpusupport_x86 files so that cpusupport can link to them.
crypto_scrypt_files= \
lib-platform/crypto/crypto_scrypt.c \
lib-platform/crypto/crypto_scrypt.h \
lib-platform/platform.h \
lib/crypto/crypto_scrypt_smix.c \
lib/crypto/crypto_scrypt_smix.h \
lib/crypto/crypto_scrypt_smix_sse2.h \
lib-platform/platform.h \
lib-platform/crypto/crypto_scrypt.c \
lib-platform/crypto/crypto_scrypt.h \
libcperciva/alg/sha256.c \
libcperciva/alg/sha256.h \
libcperciva/alg/sha256_arm.h \
libcperciva/alg/sha256_shani.h \
libcperciva/alg/sha256_sse2.h \
libcperciva/cpusupport/cpusupport.h \
libcperciva/cpusupport/cpusupport_arm_aes.c \
libcperciva/cpusupport/cpusupport_arm_sha256.c \
libcperciva/cpusupport/cpusupport_x86_aesni.c \
libcperciva/cpusupport/cpusupport_x86_rdrand.c \
libcperciva/cpusupport/cpusupport_x86_shani.c \
libcperciva/cpusupport/cpusupport_x86_sse2.c \
libcperciva/cpusupport/cpusupport_x86_ssse3.c \
libcperciva/util/insecure_memzero.c \
libcperciva/util/insecure_memzero.h \
libcperciva/util/warnp.c \
Expand All @@ -41,8 +31,8 @@ crypto_scrypt_files= \
# Don't include crypto_aesctr_shared.c in this list, as it should be included
# directly into other translation unit(s), and not compiled on its own.
scrypt_SOURCES= \
main.c \
$(crypto_scrypt_files) \
lib-platform/util/memlimit.h \
lib/scryptenc/scryptenc.c \
lib/scryptenc/scryptenc.h \
lib/scryptenc/scryptenc_cpuperf.c \
Expand All @@ -51,7 +41,6 @@ scrypt_SOURCES= \
lib/scryptenc/scryptenc_print_error.h \
lib/util/passphrase_entry.c \
lib/util/passphrase_entry.h \
lib-platform/util/memlimit.h \
libcperciva/crypto/crypto_aes.h \
libcperciva/crypto/crypto_aes_aesni.h \
libcperciva/crypto/crypto_aes_aesni_m128i.h \
Expand Down Expand Up @@ -81,35 +70,41 @@ scrypt_SOURCES= \
libcperciva/util/readpass.c \
libcperciva/util/readpass.h \
libcperciva/util/readpass_file.c \
libcperciva/util/sysendian.h
libcperciva/util/sysendian.h \
main.c

AM_CPPFLAGS= \
-I$(srcdir)/lib \
-I$(srcdir)/lib/crypto \
-I$(srcdir)/lib/scryptenc \
-I$(srcdir)/lib/util \
-I$(srcdir)/lib-platform \
-I$(srcdir)/lib-platform/crypto \
-I$(srcdir)/lib-platform/util \
-I$(srcdir)/lib/crypto \
-I$(srcdir)/lib/scryptenc \
-I$(srcdir)/lib/util \
-I$(srcdir)/libcperciva/alg \
-I$(srcdir)/libcperciva/cpusupport \
-I$(srcdir)/libcperciva/crypto \
-I$(srcdir)/libcperciva/util \
-DCPUSUPPORT_CONFIG_FILE=\"cpusupport-config.h\" \
-DAPISUPPORT_CONFIG_FILE=\"apisupport-config.h\" \
-DCPUSUPPORT_CONFIG_FILE=\"cpusupport-config.h\" \
-D_POSIX_C_SOURCE=200809L \
-D_XOPEN_SOURCE=700 \
${CFLAGS_POSIX}

# Each "paragraph" denotes a rank of dependencies. Libraries without
# dependencies go in the bottom paragraph; a library which depends on one of
# those goes in the preceeding paragraph; and so on.
scrypt_LDADD= \
libcperciva_crypto_aes.la \
\
libcperciva_aesni.la \
libcperciva_arm_aes.la \
libcperciva_arm_sha256.la \
libcperciva_cpusupport_detect.la \
libcperciva_rdrand.la \
libcperciva_shani.la \
libscrypt_sse2.la \
libscrypt_memlimit.la \
libcperciva_crypto_aes.la \
libcperciva_arm_sha256.la \
libcperciva_arm_aes.la \
libscrypt_sse2.la \
${LDADD_POSIX}
scrypt_man_MANS= scrypt.1

Expand Down Expand Up @@ -164,28 +159,39 @@ libcperciva_crypto_aes_la_SOURCES= libcperciva/crypto/crypto_aes.c
nodist_libcperciva_crypto_aes_la_SOURCES= cpusupport-config.h
libcperciva_crypto_aes_la_CFLAGS=`. ./apisupport-config.h; echo $${CFLAGS_LIBCRYPTO_LOW_LEVEL_AES}`

noinst_LTLIBRARIES+= libcperciva_cpusupport_detect.la
libcperciva_cpusupport_detect_la_SOURCES= \
libcperciva/cpusupport/cpusupport_arm_aes.c \
libcperciva/cpusupport/cpusupport_arm_sha256.c \
libcperciva/cpusupport/cpusupport_x86_aesni.c \
libcperciva/cpusupport/cpusupport_x86_rdrand.c \
libcperciva/cpusupport/cpusupport_x86_shani.c \
libcperciva/cpusupport/cpusupport_x86_sse2.c \
libcperciva/cpusupport/cpusupport_x86_ssse3.c
nodist_libcperciva_cpusupport_detect_la_SOURCES= cpusupport-config.h


# Library from libcperciva and scrypt code.
noinst_LTLIBRARIES+= libscrypt_sse2.la
libscrypt_sse2_la_SOURCES= \
libcperciva/alg/sha256_sse2.c \
lib/crypto/crypto_scrypt_smix_sse2.c
lib/crypto/crypto_scrypt_smix_sse2.c \
libcperciva/alg/sha256_sse2.c
nodist_libscrypt_sse2_la_SOURCES= cpusupport-config.h
libscrypt_sse2_la_CFLAGS=`. ./cpusupport-config.h; echo $${CFLAGS_X86_SSE2}`

# This library uses non-POSIX functionality, so we need to cancel the
# _POSIX_C_SOURCE and _XOPEN_SOURCE defined in AM_CPPFLAGS.
noinst_LTLIBRARIES+= libscrypt_memlimit.la
libscrypt_memlimit_la_SOURCES= \
lib-platform/util/memlimit.c \
lib-platform/util/memlimit.h
lib-platform/util/memlimit.c
libscrypt_memlimit_la_CFLAGS=`. ./apisupport-config.h; echo $${CFLAGS_NONPOSIX_MEMLIMIT}`

# Install libscrypt-kdf?
if LIBSCRYPT_KDF
lib_LTLIBRARIES= libscrypt-kdf.la
libscrypt_kdf_la_LDFLAGS= \
-version-info 1 \
-export-symbols-regex 'crypto_scrypt$$'
-export-symbols-regex 'crypto_scrypt$$' \
-version-info 1
include_HEADERS= libscrypt-kdf/scrypt-kdf.h
noinst_PROGRAMS+= tests/libscrypt-kdf/sample-libscrypt-kdf
else
Expand All @@ -198,9 +204,10 @@ endif
# Shared definitions for libscrypt-kdf.
libscrypt_kdf_la_SOURCES= $(crypto_scrypt_files)
libscrypt_kdf_la_LIBADD= \
libcperciva_arm_sha256.la \
libcperciva_cpusupport_detect.la \
libcperciva_shani.la \
libscrypt_sse2.la \
libcperciva_arm_sha256.la
libscrypt_sse2.la
# Workaround for "created with both libtool and without".
libscrypt_kdf_la_CFLAGS= $(AM_CFLAGS)

Expand Down Expand Up @@ -274,9 +281,10 @@ tests_verify_strings_test_scrypt_SOURCES= \
$(crypto_scrypt_files)

tests_verify_strings_test_scrypt_LDADD= \
libcperciva_arm_sha256.la \
libcperciva_cpusupport_detect.la \
libcperciva_shani.la \
libscrypt_sse2.la \
libcperciva_arm_sha256.la \
${LDADD_POSIX}

# Eliminate false positives while memory-checking for the test framework.
Expand Down