Use non-recursive automake.

This change also causes that now binaries and libraries are placed in
build root directory.

Now we can use subdir-objects for automake.
This commit is contained in:
Milan Broz
2017-10-11 13:18:37 +02:00
parent 892b80ffa4
commit d77bbe93c1
38 changed files with 359 additions and 440 deletions

View File

@@ -1,13 +0,0 @@
moduledir = $(libdir)/cryptsetup
noinst_LTLIBRARIES = libargon2.la
libargon2_la_CFLAGS = $(AM_CFLAGS) -std=c89 -pthread -O3 -Wall
libargon2_la_SOURCES = \
blake2/blake2b.c blake2/blake2.h blake2/blake2-impl.h blake2/blamka-round-ref.h \
argon2.c argon2.h core.c core.h encoding.c encoding.h ref.c thread.c thread.h
AM_CPPFLAGS = -Iblake2
EXTRA_DIST = LICENSE

View File

@@ -0,0 +1,21 @@
noinst_LTLIBRARIES += libargon2.la
libargon2_la_CFLAGS = $(AM_CFLAGS) -std=c89 -pthread -O3
libargon2_la_CPPFLAGS = $(AM_CPPFLAGS) -I lib/crypto_backend/argon2/blake2
libargon2_la_SOURCES = \
lib/crypto_backend/argon2/blake2/blake2b.c \
lib/crypto_backend/argon2/blake2/blake2.h \
lib/crypto_backend/argon2/blake2/blake2-impl.h \
lib/crypto_backend/argon2/blake2/blamka-round-ref.h \
lib/crypto_backend/argon2/argon2.c \
lib/crypto_backend/argon2/argon2.h \
lib/crypto_backend/argon2/core.c \
lib/crypto_backend/argon2/core.h \
lib/crypto_backend/argon2/encoding.c \
lib/crypto_backend/argon2/encoding.h \
lib/crypto_backend/argon2/ref.c \
lib/crypto_backend/argon2/thread.c \
lib/crypto_backend/argon2/thread.h
EXTRA_DIST += lib/crypto_backend/argon2/LICENSE