From d77bbe93c1bbbfa4e904c9c96ed68cc9cc004046 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Wed, 11 Oct 2017 13:18:37 +0200 Subject: [PATCH] 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. --- Makefile.am | 48 +++++++-- configure.ac | 19 +--- lib/Makefile.am | 83 --------------- lib/Makemodule.am | 92 +++++++++++++++++ lib/crypto_backend/Makefile.am | 37 ------- lib/crypto_backend/Makemodule.am | 36 +++++++ lib/crypto_backend/argon2/Makefile.am | 13 --- lib/crypto_backend/argon2/Makemodule.am | 21 ++++ lib/integrity/Makefile.am | 13 --- lib/loopaes/Makefile.am | 14 --- lib/luks1/Makefile.am | 17 ---- lib/luks2/Makefile.am | 23 ----- lib/tcrypt/Makefile.am | 14 --- lib/verity/Makefile.am | 17 ---- man/Makefile.am | 15 --- man/Makemodule.am | 15 +++ python/Makefile.am | 16 --- python/Makemodule.am | 13 +++ scripts/Makefile.am | 1 - scripts/Makemodule.am | 1 + src/Makefile.am | 129 ------------------------ src/Makemodule.am | 114 +++++++++++++++++++++ tests/Makefile.am | 4 +- tests/align-test | 2 +- tests/compat-test | 6 +- tests/compat-test2 | 6 +- tests/device-test | 2 +- tests/discards-test | 2 +- tests/integrity-compat-test | 2 +- tests/loopaes-test | 2 +- tests/luks1-compat-test | 2 +- tests/luks2-integrity-test | 2 +- tests/luks2-validation-test | 6 +- tests/mode-test | 2 +- tests/password-hash-test | 2 +- tests/reencryption-compat-test | 4 +- tests/tcrypt-compat-test | 2 +- tests/verity-compat-test | 2 +- 38 files changed, 359 insertions(+), 440 deletions(-) delete mode 100644 lib/Makefile.am create mode 100644 lib/Makemodule.am delete mode 100644 lib/crypto_backend/Makefile.am create mode 100644 lib/crypto_backend/Makemodule.am delete mode 100644 lib/crypto_backend/argon2/Makefile.am create mode 100644 lib/crypto_backend/argon2/Makemodule.am delete mode 100644 lib/integrity/Makefile.am delete mode 100644 lib/loopaes/Makefile.am delete mode 100644 lib/luks1/Makefile.am delete mode 100644 lib/luks2/Makefile.am delete mode 100644 lib/tcrypt/Makefile.am delete mode 100644 lib/verity/Makefile.am delete mode 100644 man/Makefile.am create mode 100644 man/Makemodule.am delete mode 100644 python/Makefile.am create mode 100644 python/Makemodule.am delete mode 100644 scripts/Makefile.am create mode 100644 scripts/Makemodule.am delete mode 100644 src/Makefile.am create mode 100644 src/Makemodule.am diff --git a/Makefile.am b/Makefile.am index a74b00ef..9d2bb6eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,14 +1,46 @@ EXTRA_DIST = COPYING.LGPL FAQ docs misc -SUBDIRS = \ - lib \ - src \ - man \ - python \ - tests \ - po \ - scripts +SUBDIRS = po tests +TESTS = +CLEANFILES = +DISTCLEAN_TARGETS = + +AM_CPPFLAGS = \ + -include config.h \ + -I$(top_srcdir)/lib \ + -DDATADIR=\""$(datadir)"\" \ + -DLOCALEDIR=\""$(datadir)/locale"\" \ + -DLIBDIR=\""$(libdir)"\" \ + -DPREFIX=\""$(prefix)"\" \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DVERSION=\""$(VERSION)"\" +AM_CFLAGS = -Wall +AM_LDFLAGS = + +noinst_LTLIBRARIES = +sbin_PROGRAMS = +man8_MANS = + +include man/Makemodule.am + +include python/Makemodule.am + +include scripts/Makemodule.am + +include lib/crypto_backend/argon2/Makemodule.am +include lib/crypto_backend/Makemodule.am +include lib/Makemodule.am + +include src/Makemodule.am ACLOCAL_AMFLAGS = -I m4 +DISTCHECK_CONFIGURE_FLAGS = \ + --enable-python \ + --enable-cryptsetup-reencrypt + +distclean-local: + -find . -name \*~ -o -name \*.orig -o -name \*.rej | xargs rm -f + rm -rf autom4te.cache + clean-local: -rm -rf docs/doxygen_api_docs diff --git a/configure.ac b/configure.ac index 95978c32..cc7f86c6 100644 --- a/configure.ac +++ b/configure.ac @@ -15,8 +15,8 @@ AC_CONFIG_HEADERS([config.h:config.h.in]) # http://lists.gnu.org/archive/html/automake/2013-01/msg00060.html # For old automake use this -#AM_INIT_AUTOMAKE(dist-xz) -AM_INIT_AUTOMAKE([dist-xz 1.12 serial-tests]) +#AM_INIT_AUTOMAKE(dist-xz subdir-objects) +AM_INIT_AUTOMAKE([dist-xz 1.12 serial-tests subdir-objects]) if test "x$prefix" = "xNONE"; then sysconfdir=/etc @@ -533,22 +533,9 @@ AC_SUBST(DEFAULT_LUKS2_LOCK_DIR_PERMS) dnl ========================================================================== AC_CONFIG_FILES([ Makefile -lib/Makefile lib/libcryptsetup.pc -lib/crypto_backend/Makefile -lib/crypto_backend/argon2/Makefile -lib/luks1/Makefile -lib/luks2/Makefile -lib/loopaes/Makefile -lib/verity/Makefile -lib/tcrypt/Makefile -lib/integrity/Makefile -src/Makefile po/Makefile.in -man/Makefile -tests/Makefile -python/Makefile -scripts/Makefile scripts/cryptsetup_tmpfiles.conf +tests/Makefile ]) AC_OUTPUT diff --git a/lib/Makefile.am b/lib/Makefile.am deleted file mode 100644 index ebe076c8..00000000 --- a/lib/Makefile.am +++ /dev/null @@ -1,83 +0,0 @@ -SUBDIRS = crypto_backend luks1 luks2 loopaes verity tcrypt integrity - -moduledir = $(libdir)/cryptsetup - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libcryptsetup.pc - -AM_CPPFLAGS = -include config.h \ - -I$(top_srcdir) \ - -I$(top_srcdir)/lib/crypto_backend \ - -I$(top_srcdir)/lib/luks1 \ - -I$(top_srcdir)/lib/luks2 \ - -I$(top_srcdir)/lib/loopaes \ - -I$(top_srcdir)/lib/verity \ - -I$(top_srcdir)/lib/tcrypt \ - -I$(top_srcdir)/lib/integrity \ - -DDATADIR=\""$(datadir)"\" \ - -DLIBDIR=\""$(libdir)"\" \ - -DPREFIX=\""$(prefix)"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DVERSION=\""$(VERSION)"\" - -lib_LTLIBRARIES = libcryptsetup.la - -common_ldadd = \ - crypto_backend/libcrypto_backend.la \ - luks1/libluks1.la \ - luks2/libluks2.la \ - loopaes/libloopaes.la \ - verity/libverity.la \ - tcrypt/libtcrypt.la \ - integrity/libintegrity.la - -libcryptsetup_la_DEPENDENCIES = $(common_ldadd) libcryptsetup.sym - -libcryptsetup_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined \ - -Wl,--version-script=$(top_srcdir)/lib/libcryptsetup.sym \ - -version-info @LIBCRYPTSETUP_VERSION_INFO@ - -libcryptsetup_la_CFLAGS = -Wall $(AM_CFLAGS) @CRYPTO_CFLAGS@ - -libcryptsetup_la_LIBADD = \ - @UUID_LIBS@ \ - @DEVMAPPER_LIBS@ \ - @CRYPTO_LIBS@ \ - @LIBARGON2_LIBS@ \ - @JSON_C_LIBS@ \ - $(common_ldadd) - - -libcryptsetup_la_SOURCES = \ - setup.c \ - internal.h \ - bitops.h \ - nls.h \ - libcryptsetup.h \ - utils.c \ - utils_benchmark.c \ - utils_crypt.c \ - utils_crypt.h \ - utils_loop.c \ - utils_loop.h \ - utils_devpath.c \ - utils_wipe.c \ - utils_fips.c \ - utils_fips.h \ - utils_device.c \ - utils_keyring.c \ - utils_keyring.h \ - utils_device_locking.c \ - utils_device_locking.h \ - utils_pbkdf.c \ - libdevmapper.c \ - utils_dm.h \ - volumekey.c \ - random.c \ - crypt_plain.c \ - base64.h \ - base64.c - -include_HEADERS = libcryptsetup.h - -EXTRA_DIST = libcryptsetup.pc.in libcryptsetup.sym diff --git a/lib/Makemodule.am b/lib/Makemodule.am new file mode 100644 index 00000000..67e944b2 --- /dev/null +++ b/lib/Makemodule.am @@ -0,0 +1,92 @@ +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = lib/libcryptsetup.pc + +lib_LTLIBRARIES = libcryptsetup.la + +include_HEADERS = lib/libcryptsetup.h + +EXTRA_DIST += lib/libcryptsetup.pc.in lib/libcryptsetup.sym + +libcryptsetup_la_CPPFLAGS = $(AM_CPPFLAGS) \ + -I $(top_srcdir)/lib/crypto_backend \ + -I $(top_srcdir)/lib/luks1 \ + -I $(top_srcdir)/lib/luks2 \ + -I $(top_srcdir)/lib/loopaes \ + -I $(top_srcdir)/lib/verity \ + -I $(top_srcdir)/lib/tcrypt \ + -I $(top_srcdir)/lib/integrity + +libcryptsetup_la_DEPENDENCIES = libcrypto_backend.la lib/libcryptsetup.sym + +libcryptsetup_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined \ + -Wl,--version-script=$(top_srcdir)/lib/libcryptsetup.sym \ + -version-info @LIBCRYPTSETUP_VERSION_INFO@ + +libcryptsetup_la_CFLAGS = $(AM_CFLAGS) @CRYPTO_CFLAGS@ + +libcryptsetup_la_LIBADD = \ + @UUID_LIBS@ \ + @DEVMAPPER_LIBS@ \ + @CRYPTO_LIBS@ \ + @LIBARGON2_LIBS@ \ + @JSON_C_LIBS@ \ + libcrypto_backend.la + +libcryptsetup_la_SOURCES = \ + lib/setup.c \ + lib/internal.h \ + lib/bitops.h \ + lib/nls.h \ + lib/libcryptsetup.h \ + lib/utils.c \ + lib/utils_benchmark.c \ + lib/utils_crypt.c \ + lib/utils_crypt.h \ + lib/utils_loop.c \ + lib/utils_loop.h \ + lib/utils_devpath.c \ + lib/utils_wipe.c \ + lib/utils_fips.c \ + lib/utils_fips.h \ + lib/utils_device.c \ + lib/utils_keyring.c \ + lib/utils_keyring.h \ + lib/utils_device_locking.c \ + lib/utils_device_locking.h \ + lib/utils_pbkdf.c \ + lib/libdevmapper.c \ + lib/utils_dm.h \ + lib/volumekey.c \ + lib/random.c \ + lib/crypt_plain.c \ + lib/base64.h \ + lib/base64.c \ + lib/integrity/integrity.h \ + lib/integrity/integrity.c \ + lib/loopaes/loopaes.h \ + lib/loopaes/loopaes.c \ + lib/tcrypt/tcrypt.h \ + lib/tcrypt/tcrypt.c \ + lib/luks1/af.h \ + lib/luks1/af.c \ + lib/luks1/keyencryption.c \ + lib/luks1/keymanage.c \ + lib/luks1/luks.h \ + lib/verity/verity_hash.c \ + lib/verity/verity_fec.c \ + lib/verity/verity.c \ + lib/verity/verity.h \ + lib/verity/rs_encode_char.c \ + lib/verity/rs.h \ + lib/luks2/luks2_disk_metadata.c \ + lib/luks2/luks2_json_format.c \ + lib/luks2/luks2_json_metadata.c \ + lib/luks2/luks2_luks1_convert.c \ + lib/luks2/luks2_digest.c \ + lib/luks2/luks2_digest_pbkdf2.c \ + lib/luks2/luks2_keyslot.c \ + lib/luks2/luks2_keyslot_luks2.c \ + lib/luks2/luks2_token_keyring.c \ + lib/luks2/luks2_token.c \ + lib/luks2/luks2_internal.h \ + lib/luks2/luks2.h diff --git a/lib/crypto_backend/Makefile.am b/lib/crypto_backend/Makefile.am deleted file mode 100644 index 2325b66d..00000000 --- a/lib/crypto_backend/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -moduledir = $(libdir)/cryptsetup - -noinst_LTLIBRARIES = libcrypto_backend.la - -libcrypto_backend_la_CFLAGS = $(AM_CFLAGS) -Wall @CRYPTO_CFLAGS@ - -libcrypto_backend_la_SOURCES = crypto_backend.h \ - crypto_cipher_kernel.c crypto_storage.c pbkdf_check.c crc32.c \ - argon2_generic.c - -if CRYPTO_BACKEND_GCRYPT -libcrypto_backend_la_SOURCES += crypto_gcrypt.c -endif -if CRYPTO_BACKEND_OPENSSL -libcrypto_backend_la_SOURCES += crypto_openssl.c -endif -if CRYPTO_BACKEND_NSS -libcrypto_backend_la_SOURCES += crypto_nss.c -endif -if CRYPTO_BACKEND_KERNEL -libcrypto_backend_la_SOURCES += crypto_kernel.c -endif -if CRYPTO_BACKEND_NETTLE -libcrypto_backend_la_SOURCES += crypto_nettle.c -endif - -if CRYPTO_INTERNAL_PBKDF2 -libcrypto_backend_la_SOURCES += pbkdf2_generic.c -endif - -if CRYPTO_INTERNAL_ARGON2 -SUBDIRS = argon2 -libcrypto_backend_la_DEPENDENCIES = argon2/libargon2.la -libcrypto_backend_la_LIBADD = argon2/libargon2.la -endif - -AM_CPPFLAGS = -include config.h -I$(top_srcdir)/lib diff --git a/lib/crypto_backend/Makemodule.am b/lib/crypto_backend/Makemodule.am new file mode 100644 index 00000000..894551ec --- /dev/null +++ b/lib/crypto_backend/Makemodule.am @@ -0,0 +1,36 @@ +noinst_LTLIBRARIES += libcrypto_backend.la + +libcrypto_backend_la_CFLAGS = $(AM_CFLAGS) @CRYPTO_CFLAGS@ + +libcrypto_backend_la_SOURCES = \ + lib/crypto_backend/crypto_backend.h \ + lib/crypto_backend/crypto_cipher_kernel.c \ + lib/crypto_backend/crypto_storage.c \ + lib/crypto_backend/pbkdf_check.c \ + lib/crypto_backend/crc32.c \ + lib/crypto_backend/argon2_generic.c + +if CRYPTO_BACKEND_GCRYPT +libcrypto_backend_la_SOURCES += lib/crypto_backend/crypto_gcrypt.c +endif +if CRYPTO_BACKEND_OPENSSL +libcrypto_backend_la_SOURCES += lib/crypto_backend/crypto_openssl.c +endif +if CRYPTO_BACKEND_NSS +libcrypto_backend_la_SOURCES += lib/crypto_backend/crypto_nss.c +endif +if CRYPTO_BACKEND_KERNEL +libcrypto_backend_la_SOURCES += lib/crypto_backend/crypto_kernel.c +endif +if CRYPTO_BACKEND_NETTLE +libcrypto_backend_la_SOURCES += lib/crypto_backend/crypto_nettle.c +endif + +if CRYPTO_INTERNAL_PBKDF2 +libcrypto_backend_la_SOURCES += lib/crypto_backend/pbkdf2_generic.c +endif + +if CRYPTO_INTERNAL_ARGON2 +libcrypto_backend_la_DEPENDENCIES = libargon2.la +libcrypto_backend_la_LIBADD = libargon2.la +endif diff --git a/lib/crypto_backend/argon2/Makefile.am b/lib/crypto_backend/argon2/Makefile.am deleted file mode 100644 index 0a87454f..00000000 --- a/lib/crypto_backend/argon2/Makefile.am +++ /dev/null @@ -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 diff --git a/lib/crypto_backend/argon2/Makemodule.am b/lib/crypto_backend/argon2/Makemodule.am new file mode 100644 index 00000000..102f9387 --- /dev/null +++ b/lib/crypto_backend/argon2/Makemodule.am @@ -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 diff --git a/lib/integrity/Makefile.am b/lib/integrity/Makefile.am deleted file mode 100644 index c404e48a..00000000 --- a/lib/integrity/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -moduledir = $(libdir)/cryptsetup - -noinst_LTLIBRARIES = libintegrity.la - -libintegrity_la_CFLAGS = -Wall $(AM_CFLAGS) @CRYPTO_CFLAGS@ - -libintegrity_la_SOURCES = \ - integrity.c \ - integrity.h - -AM_CPPFLAGS = -include config.h \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/crypto_backend diff --git a/lib/loopaes/Makefile.am b/lib/loopaes/Makefile.am deleted file mode 100644 index 0687c40a..00000000 --- a/lib/loopaes/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -moduledir = $(libdir)/cryptsetup - -noinst_LTLIBRARIES = libloopaes.la - -libloopaes_la_CFLAGS = -Wall $(AM_CFLAGS) @CRYPTO_CFLAGS@ - -libloopaes_la_SOURCES = \ - loopaes.c \ - loopaes.h - -AM_CPPFLAGS = -include config.h \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/crypto_backend - diff --git a/lib/luks1/Makefile.am b/lib/luks1/Makefile.am deleted file mode 100644 index 5d6800e7..00000000 --- a/lib/luks1/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -moduledir = $(libdir)/cryptsetup - -noinst_LTLIBRARIES = libluks1.la - -libluks1_la_CFLAGS = -Wall $(AM_CFLAGS) @CRYPTO_CFLAGS@ - -libluks1_la_SOURCES = \ - af.c \ - keymanage.c \ - keyencryption.c \ - af.h \ - luks.h - -AM_CPPFLAGS = -include config.h \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/crypto_backend - diff --git a/lib/luks2/Makefile.am b/lib/luks2/Makefile.am deleted file mode 100644 index f228aa2b..00000000 --- a/lib/luks2/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -moduledir = $(libdir)/cryptsetup - -noinst_LTLIBRARIES = libluks2.la - -libluks2_la_CFLAGS = -Wall $(AM_CFLAGS) @CRYPTO_CFLAGS@ - -libluks2_la_SOURCES = \ - luks2_disk_metadata.c \ - luks2_json_format.c \ - luks2_json_metadata.c \ - luks2_luks1_convert.c \ - luks2_digest.c \ - luks2_digest_pbkdf2.c \ - luks2_keyslot.c \ - luks2_keyslot_luks2.c \ - luks2_token_keyring.c \ - luks2_token.c \ - luks2_internal.h \ - luks2.h - -AM_CPPFLAGS = -include config.h \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/crypto_backend diff --git a/lib/tcrypt/Makefile.am b/lib/tcrypt/Makefile.am deleted file mode 100644 index 88bf5209..00000000 --- a/lib/tcrypt/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -moduledir = $(libdir)/cryptsetup - -noinst_LTLIBRARIES = libtcrypt.la - -libtcrypt_la_CFLAGS = -Wall $(AM_CFLAGS) @CRYPTO_CFLAGS@ - -libtcrypt_la_SOURCES = \ - tcrypt.c \ - tcrypt.h - -AM_CPPFLAGS = -include config.h \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/crypto_backend - diff --git a/lib/verity/Makefile.am b/lib/verity/Makefile.am deleted file mode 100644 index 9dce6f95..00000000 --- a/lib/verity/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -moduledir = $(libdir)/cryptsetup - -noinst_LTLIBRARIES = libverity.la - -libverity_la_CFLAGS = -Wall $(AM_CFLAGS) @CRYPTO_CFLAGS@ - -libverity_la_SOURCES = \ - verity_hash.c \ - verity_fec.c \ - verity.c \ - verity.h \ - rs_encode_char.c \ - rs.h - -AM_CPPFLAGS = -include config.h \ - -I$(top_srcdir)/lib \ - -I$(top_srcdir)/lib/crypto_backend diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index 5bc108ae..00000000 --- a/man/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -man8_MANS = cryptsetup.8 - -if VERITYSETUP -man8_MANS += veritysetup.8 -endif - -if REENCRYPT -man8_MANS += cryptsetup-reencrypt.8 -endif - -if INTEGRITYSETUP -man8_MANS += integritysetup.8 -endif - -EXTRA_DIST = cryptsetup.8 integritysetup.8 veritysetup.8 cryptsetup-reencrypt.8 diff --git a/man/Makemodule.am b/man/Makemodule.am new file mode 100644 index 00000000..3f68441f --- /dev/null +++ b/man/Makemodule.am @@ -0,0 +1,15 @@ +EXTRA_DIST += man/cryptsetup.8 man/integritysetup.8 man/veritysetup.8 man/cryptsetup-reencrypt.8 + +man8_MANS += man/cryptsetup.8 + +if VERITYSETUP +man8_MANS += man/veritysetup.8 +endif + +if REENCRYPT +man8_MANS += man/cryptsetup-reencrypt.8 +endif + +if INTEGRITYSETUP +man8_MANS += man/integritysetup.8 +endif diff --git a/python/Makefile.am b/python/Makefile.am deleted file mode 100644 index ab610828..00000000 --- a/python/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -AM_CPPFLAGS = -include $(top_srcdir)/config.h -I$(top_srcdir)/lib $(PYTHON_INCLUDES) -EXTRA_DIST = pycryptsetup-test.py -CLEANFILES = *.img - -if PYTHON_CRYPTSETUP -TESTS = pycryptsetup-test.py - -pyexec_LTLIBRARIES = pycryptsetup.la - -pycryptsetup_la_SOURCES = pycryptsetup.c -pycryptsetup_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS) -fno-strict-aliasing -pycryptsetup_la_LDFLAGS = -avoid-version -module -shared -export-dynamic -pycryptsetup_la_LIBADD = $(top_builddir)/lib/libcryptsetup.la $(PYTHON_LIBS) -else -all: -endif diff --git a/python/Makemodule.am b/python/Makemodule.am new file mode 100644 index 00000000..79b8ba48 --- /dev/null +++ b/python/Makemodule.am @@ -0,0 +1,13 @@ +EXTRA_DIST += python/pycryptsetup-test.py +CLEANFILES += python/*.img + +if PYTHON_CRYPTSETUP +TESTS += python/pycryptsetup-test.py + +pyexec_LTLIBRARIES = pycryptsetup.la + +pycryptsetup_la_SOURCES = python/pycryptsetup.c +pycryptsetup_la_CPPFLAGS = $(AM_CPPFLAGS) $(PYTHON_CPPFLAGS) $(PYTHON_INCLUDES) -fno-strict-aliasing +pycryptsetup_la_LDFLAGS = -avoid-version -module -shared -export-dynamic +pycryptsetup_la_LIBADD = libcryptsetup.la $(PYTHON_LIBS) +endif diff --git a/scripts/Makefile.am b/scripts/Makefile.am deleted file mode 100644 index fdec13f3..00000000 --- a/scripts/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -DISTCLEAN_TARGETS = cryptsetup_tmpfiles.conf diff --git a/scripts/Makemodule.am b/scripts/Makemodule.am new file mode 100644 index 00000000..16d0d3bd --- /dev/null +++ b/scripts/Makemodule.am @@ -0,0 +1 @@ +DISTCLEAN_TARGETS += cryptsetup_tmpfiles.conf diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 410a7566..00000000 --- a/src/Makefile.am +++ /dev/null @@ -1,129 +0,0 @@ -AM_CPPFLAGS = -include config.h \ - -I$(top_srcdir) \ - -I$(top_srcdir)/lib \ - -DDATADIR=\""$(datadir)"\" \ - -DLOCALEDIR=\""$(datadir)/locale"\" \ - -DLIBDIR=\""$(libdir)"\" \ - -DPREFIX=\""$(prefix)"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DVERSION=\""$(VERSION)"\" - -# cryptsetup -cryptsetup_SOURCES = \ - $(top_builddir)/lib/utils_crypt.c \ - $(top_builddir)/lib/utils_loop.c \ - utils_tools.c \ - utils_password.c \ - cryptsetup.c \ - cryptsetup.h - -cryptsetup_LDADD = -lm \ - $(top_builddir)/lib/libcryptsetup.la \ - @POPT_LIBS@ \ - @PWQUALITY_LIBS@ \ - @PASSWDQC_LIBS@ \ - @UUID_LIBS@ - -cryptsetup_CFLAGS = $(AM_CFLAGS) -Wall - -sbin_PROGRAMS=cryptsetup - -if STATIC_TOOLS -sbin_PROGRAMS += cryptsetup.static -cryptsetup_static_SOURCES = $(cryptsetup_SOURCES) -cryptsetup_static_CFLAGS = $(cryptsetup_CFLAGS) -cryptsetup_static_LDFLAGS = $(AM_LDFLAGS) -all-static -cryptsetup_static_LDADD = $(cryptsetup_LDADD) \ - @CRYPTO_STATIC_LIBS@ \ - @PWQUALITY_STATIC_LIBS@ \ - @DEVMAPPER_STATIC_LIBS@ \ - @UUID_LIBS@ -endif - -# veritysetup -if VERITYSETUP - -veritysetup_SOURCES = \ - $(top_builddir)/lib/utils_crypt.c \ - $(top_builddir)/lib/utils_loop.c \ - utils_tools.c \ - veritysetup.c \ - cryptsetup.h - -veritysetup_LDADD = -lm \ - $(top_builddir)/lib/libcryptsetup.la \ - @POPT_LIBS@ - -veritysetup_CFLAGS = $(cryptsetup_CFLAGS) - -sbin_PROGRAMS += veritysetup - -if STATIC_TOOLS -sbin_PROGRAMS += veritysetup.static -veritysetup_static_SOURCES = $(veritysetup_SOURCES) -veritysetup_static_CFLAGS = $(veritysetup_CFLAGS) -veritysetup_static_LDFLAGS = $(AM_LDFLAGS) -all-static -veritysetup_static_LDADD = $(veritysetup_LDADD) \ - @CRYPTO_STATIC_LIBS@ \ - @DEVMAPPER_STATIC_LIBS@ \ - @UUID_LIBS@ -endif -endif - -# integritysetup -if INTEGRITYSETUP - -integritysetup_SOURCES = \ - $(top_builddir)/lib/utils_crypt.c \ - $(top_builddir)/lib/utils_loop.c \ - utils_tools.c \ - integritysetup.c \ - cryptsetup.h - -integritysetup_LDADD = -lm \ - $(top_builddir)/lib/libcryptsetup.la \ - @POPT_LIBS@ \ - @UUID_LIBS@ - -integritysetup_CFLAGS = $(cryptsetup_CFLAGS) - -sbin_PROGRAMS += integritysetup - -if STATIC_TOOLS -sbin_PROGRAMS += integritysetup.static -integritysetup_static_SOURCES = $(integritysetup_SOURCES) -integritysetup_static_CFLAGS = $(integritysetup_CFLAGS) -integritysetup_static_LDFLAGS = $(AM_LDFLAGS) -all-static -integritysetup_static_LDADD = $(integritysetup_LDADD) \ - @CRYPTO_STATIC_LIBS@ \ - @DEVMAPPER_STATIC_LIBS@ \ - @UUID_LIBS@ -endif -endif - -# reencrypt -if REENCRYPT -cryptsetup_reencrypt_SOURCES = \ - $(top_builddir)/lib/utils_crypt.c \ - utils_tools.c \ - utils_password.c \ - cryptsetup_reencrypt.c \ - cryptsetup.h - -cryptsetup_reencrypt_LDADD = $(cryptsetup_LDADD) \ - @UUID_LIBS@ -cryptsetup_reencrypt_CFLAGS = $(cryptsetup_CFLAGS) - -sbin_PROGRAMS += cryptsetup-reencrypt - -if STATIC_TOOLS -sbin_PROGRAMS += cryptsetup-reencrypt.static -cryptsetup_reencrypt_static_SOURCES = $(cryptsetup_reencrypt_SOURCES) -cryptsetup_reencrypt_static_CFLAGS = $(cryptsetup_reencrypt_CFLAGS) -cryptsetup_reencrypt_static_LDFLAGS = $(AM_LDFLAGS) -all-static -cryptsetup_reencrypt_static_LDADD = $(cryptsetup_reencrypt_LDADD) \ - @CRYPTO_STATIC_LIBS@ \ - @DEVMAPPER_STATIC_LIBS@ \ - @UUID_LIBS@ -endif -endif diff --git a/src/Makemodule.am b/src/Makemodule.am new file mode 100644 index 00000000..094edd3f --- /dev/null +++ b/src/Makemodule.am @@ -0,0 +1,114 @@ +# cryptsetup +cryptsetup_SOURCES = \ + lib/utils_crypt.c \ + lib/utils_loop.c \ + src/utils_tools.c \ + src/utils_password.c \ + src/cryptsetup.c \ + src/cryptsetup.h + +cryptsetup_LDADD = -lm \ + libcryptsetup.la \ + @POPT_LIBS@ \ + @PWQUALITY_LIBS@ \ + @PASSWDQC_LIBS@ \ + @UUID_LIBS@ + +sbin_PROGRAMS += cryptsetup + +if STATIC_TOOLS +sbin_PROGRAMS += cryptsetup.static +cryptsetup_static_SOURCES = $(cryptsetup_SOURCES) +cryptsetup_static_LDFLAGS = $(AM_LDFLAGS) -all-static +cryptsetup_static_LDADD = \ + $(cryptsetup_LDADD) \ + @CRYPTO_STATIC_LIBS@ \ + @PWQUALITY_STATIC_LIBS@ \ + @DEVMAPPER_STATIC_LIBS@ +endif + +# veritysetup +if VERITYSETUP + +veritysetup_SOURCES = \ + lib/utils_crypt.c \ + lib/utils_loop.c \ + src/utils_tools.c \ + src/veritysetup.c \ + src/cryptsetup.h + +veritysetup_LDADD = -lm \ + libcryptsetup.la \ + @POPT_LIBS@ + +sbin_PROGRAMS += veritysetup + +if STATIC_TOOLS +sbin_PROGRAMS += veritysetup.static +veritysetup_static_SOURCES = $(veritysetup_SOURCES) +veritysetup_static_LDFLAGS = $(AM_LDFLAGS) -all-static +veritysetup_static_LDADD = \ + $(veritysetup_LDADD) \ + @CRYPTO_STATIC_LIBS@ \ + @DEVMAPPER_STATIC_LIBS@ \ + @UUID_LIBS@ +endif +endif + +# integritysetup +if INTEGRITYSETUP + +integritysetup_SOURCES = \ + lib/utils_crypt.c \ + lib/utils_loop.c \ + src/utils_tools.c \ + src/integritysetup.c \ + src/cryptsetup.h + +integritysetup_LDADD = -lm \ + libcryptsetup.la \ + @POPT_LIBS@ \ + @UUID_LIBS@ + +sbin_PROGRAMS += integritysetup + +if STATIC_TOOLS +sbin_PROGRAMS += integritysetup.static +integritysetup_static_SOURCES = $(integritysetup_SOURCES) +integritysetup_static_LDFLAGS = $(AM_LDFLAGS) -all-static +integritysetup_static_LDADD = \ + $(integritysetup_LDADD) \ + @CRYPTO_STATIC_LIBS@ \ + @DEVMAPPER_STATIC_LIBS@ \ + @UUID_LIBS@ +endif +endif + +# reencrypt +if REENCRYPT +cryptsetup_reencrypt_SOURCES = \ + lib/utils_crypt.c \ + src/utils_tools.c \ + src/utils_password.c \ + src/cryptsetup_reencrypt.c \ + src/cryptsetup.h + +cryptsetup_reencrypt_LDADD = -lm \ + libcryptsetup.la \ + @POPT_LIBS@ \ + @PWQUALITY_LIBS@ \ + @PASSWDQC_LIBS@ \ + @UUID_LIBS@ + +sbin_PROGRAMS += cryptsetup-reencrypt + +if STATIC_TOOLS +sbin_PROGRAMS += cryptsetup-reencrypt.static +cryptsetup_reencrypt_static_SOURCES = $(cryptsetup_reencrypt_SOURCES) +cryptsetup_reencrypt_static_LDFLAGS = $(AM_LDFLAGS) -all-static +cryptsetup_reencrypt_static_LDADD = \ + $(cryptsetup_reencrypt_LDADD) \ + @CRYPTO_STATIC_LIBS@ \ + @DEVMAPPER_STATIC_LIBS@ +endif +endif diff --git a/tests/Makefile.am b/tests/Makefile.am index b9cf3f05..3557f7bb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -65,13 +65,13 @@ differ_SOURCES = differ.c differ_CFLAGS = $(AM_CFLAGS) -Wall -O2 api_test_SOURCES = api-test.c api_test.h test_utils.c -api_test_LDADD = ../lib/libcryptsetup.la +api_test_LDADD = ../libcryptsetup.la api_test_LDFLAGS = $(AM_LDFLAGS) -static api_test_CFLAGS = -g -Wall -O0 $(AM_CFLAGS) -I$(top_srcdir)/lib/ -I$(top_srcdir)/lib/luks1 api_test_CPPFLAGS = $(AM_CPPFLAGS) -include config.h api_test_2_SOURCES = api-test-2.c api_test.h test_utils.c -api_test_2_LDADD = ../lib/libcryptsetup.la +api_test_2_LDADD = ../libcryptsetup.la api_test_2_LDFLAGS = $(AM_LDFLAGS) -static api_test_2_CFLAGS = -g -Wall -O0 $(AM_CFLAGS) -I$(top_srcdir)/lib/ -I$(top_srcdir)/lib/luks1 api_test_2_CPPFLAGS = $(AM_CPPFLAGS) -include config.h diff --git a/tests/align-test b/tests/align-test index 3ec0fc70..eda0dcbf 100755 --- a/tests/align-test +++ b/tests/align-test @@ -1,6 +1,6 @@ #!/bin/bash -CRYPTSETUP="../src/cryptsetup" +CRYPTSETUP="../cryptsetup" DEV="" DEV_STACKED="luks0xbabe" MNT_DIR="./mnt_luks" diff --git a/tests/compat-test b/tests/compat-test index 1fd4715f..0feabbf8 100755 --- a/tests/compat-test +++ b/tests/compat-test @@ -1,10 +1,10 @@ #!/bin/bash PS4='$LINENO:' -CRYPTSETUP=../src/cryptsetup +CRYPTSETUP=../cryptsetup -CRYPTSETUP_VALGRIND=../src/.libs/cryptsetup -CRYPTSETUP_LIB_VALGRIND=../lib/.libs +CRYPTSETUP_VALGRIND=../.libs/cryptsetup +CRYPTSETUP_LIB_VALGRIND=../.libs DEV_NAME=dummy DEV_NAME2=dummy2 diff --git a/tests/compat-test2 b/tests/compat-test2 index e42f3066..6994fc4f 100755 --- a/tests/compat-test2 +++ b/tests/compat-test2 @@ -1,10 +1,10 @@ #!/bin/bash PS4='$LINENO:' -CRYPTSETUP=../src/cryptsetup +CRYPTSETUP=../cryptsetup -CRYPTSETUP_VALGRIND=../src/.libs/cryptsetup -CRYPTSETUP_LIB_VALGRIND=../lib/.libs +CRYPTSETUP_VALGRIND=../.libs/cryptsetup +CRYPTSETUP_LIB_VALGRIND=../.libs DEV_NAME=dummy DEV_NAME2=dummy2 diff --git a/tests/device-test b/tests/device-test index f156d782..e64b9ce1 100755 --- a/tests/device-test +++ b/tests/device-test @@ -1,6 +1,6 @@ #!/bin/bash -CRYPTSETUP="../src/cryptsetup" +CRYPTSETUP="../cryptsetup" MNT_DIR="./mnt_luks" DEV_NAME="dummy" PWD1="93R4P4pIqAH8" diff --git a/tests/discards-test b/tests/discards-test index 6a8f1715..d5f7bda5 100755 --- a/tests/discards-test +++ b/tests/discards-test @@ -1,6 +1,6 @@ #!/bin/bash -CRYPTSETUP="../src/cryptsetup" +CRYPTSETUP="../cryptsetup" DEV_NAME="discard-t3st" DEV="" PWD1="93R4P4pIqAH8" diff --git a/tests/integrity-compat-test b/tests/integrity-compat-test index 1d583438..1b17cfdd 100755 --- a/tests/integrity-compat-test +++ b/tests/integrity-compat-test @@ -2,7 +2,7 @@ # # Test integritysetup compatibility. # -INTSETUP=../src/integritysetup +INTSETUP=../integritysetup DEV_NAME=dmc_test DEV=mode-test.img KEY_FILE=key.img diff --git a/tests/loopaes-test b/tests/loopaes-test index 72142a4a..debc7888 100755 --- a/tests/loopaes-test +++ b/tests/loopaes-test @@ -1,6 +1,6 @@ #!/bin/bash -CRYPTSETUP=../src/cryptsetup +CRYPTSETUP=../cryptsetup # try to validate using loop-AES losetup/kernel if available LOSETUP_AES=/losetup-aes.old diff --git a/tests/luks1-compat-test b/tests/luks1-compat-test index 7c39ebae..b5169c0c 100755 --- a/tests/luks1-compat-test +++ b/tests/luks1-compat-test @@ -6,7 +6,7 @@ # that you are not using old gcrypt with flawed whirlpool # (see cryptsetup debug output) -CRYPTSETUP=../src/cryptsetup +CRYPTSETUP=../cryptsetup TST_DIR=luks1-images MAP=luks1tst KEYFILE=keyfile1 diff --git a/tests/luks2-integrity-test b/tests/luks2-integrity-test index ac5c94b3..3da736f1 100755 --- a/tests/luks2-integrity-test +++ b/tests/luks2-integrity-test @@ -2,7 +2,7 @@ # # Test cryptsetup/authenticated encryption compatibility. # -CRYPTSETUP=../src/cryptsetup +CRYPTSETUP=../cryptsetup DEV_NAME=dmi_test DEV=mode-test.img PWD1=nHjJHjI23JK diff --git a/tests/luks2-validation-test b/tests/luks2-validation-test index c1a7e7a1..f6dca3d0 100755 --- a/tests/luks2-validation-test +++ b/tests/luks2-validation-test @@ -3,10 +3,10 @@ #turn on debug mode by following env. variable _DEBUG=1 PS4='$LINENO:' -CRYPTSETUP=../src/cryptsetup +CRYPTSETUP=../cryptsetup -CRYPTSETUP_VALGRIND=../src/.libs/cryptsetup -CRYPTSETUP_LIB_VALGRIND=../lib/.libs +CRYPTSETUP_VALGRIND=../.libs/cryptsetup +CRYPTSETUP_LIB_VALGRIND=../.libs DM_CRYPT_SECTOR=512 LUKS2_HDR_SIZE=2112 # 16 KiB version, stored twice, including luks2 areas with keyslots diff --git a/tests/mode-test b/tests/mode-test index 2105823b..32383c29 100755 --- a/tests/mode-test +++ b/tests/mode-test @@ -2,7 +2,7 @@ # # Test mode compatibility, check input + kernel and cryptsetup cipher status # -CRYPTSETUP=../src/cryptsetup +CRYPTSETUP=../cryptsetup DEV_NAME=dmc_test HEADER_IMG=mode-test.img PASSWORD=3xrododenron diff --git a/tests/password-hash-test b/tests/password-hash-test index 6a6ef039..bc7da87e 100755 --- a/tests/password-hash-test +++ b/tests/password-hash-test @@ -2,7 +2,7 @@ # check hash processing in create command -CRYPTSETUP=../src/cryptsetup +CRYPTSETUP=../cryptsetup DEV_NAME=dmc_test KEY_FILE=keyfile diff --git a/tests/reencryption-compat-test b/tests/reencryption-compat-test index 5ed51431..9b7afcd6 100755 --- a/tests/reencryption-compat-test +++ b/tests/reencryption-compat-test @@ -1,7 +1,7 @@ #!/bin/bash -CRYPTSETUP=../src/cryptsetup -REENC=../src/cryptsetup-reencrypt +CRYPTSETUP=../cryptsetup +REENC=../cryptsetup-reencrypt DEV_NAME=reenc9768 DEV_NAME2=reenc1273 diff --git a/tests/tcrypt-compat-test b/tests/tcrypt-compat-test index 40ca4542..3643925f 100755 --- a/tests/tcrypt-compat-test +++ b/tests/tcrypt-compat-test @@ -2,7 +2,7 @@ # check tcrypt images parsing -CRYPTSETUP=../src/cryptsetup +CRYPTSETUP=../cryptsetup TST_DIR=tcrypt-images MAP=tctst PASSWORD="aaaaaaaaaaaa" diff --git a/tests/verity-compat-test b/tests/verity-compat-test index 86b21cbc..4aa0e81f 100755 --- a/tests/verity-compat-test +++ b/tests/verity-compat-test @@ -1,6 +1,6 @@ #!/bin/bash -VERITYSETUP=../src/veritysetup +VERITYSETUP=../veritysetup DEV_NAME=verity3273 DEV_OUT="$DEV_NAME.out"