diff options
| author | Stanislaw Wadas <s.wadas@samsung.com> | 2023-07-20 12:02:56 +0200 |
|---|---|---|
| committer | Stanislaw Wadas <s.wadas@samsung.com> | 2023-07-20 15:33:34 +0200 |
| commit | 420ad62f0bb77970a6ba234bde9e1405f7df7789 (patch) | |
| tree | 1e6e949dd092a6fea99d6ab1430df03f89e09a7c /Makefile.am | |
| parent | 690c363eb90277fc53a97e3e2367ebe12055937e (diff) | |
| parent | 6497abd1df88001eb1f45f7348534911b33d05b5 (diff) | |
| download | cryptsetup-420ad62f0bb77970a6ba234bde9e1405f7df7789.tar.gz cryptsetup-420ad62f0bb77970a6ba234bde9e1405f7df7789.tar.bz2 cryptsetup-420ad62f0bb77970a6ba234bde9e1405f7df7789.zip | |
Merge branch 'upstream' into tizen
This commit upgrades cryptsetup to v2.6.1, which uses openssl v3
Change-Id: I3d78b2485ebf215ff90bb4b8bfb5e512a3513c5f
Signed-off-by: Stanislaw Wadas <s.wadas@samsung.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index a5ccaa8..16c0a4d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ -EXTRA_DIST = COPYING.LGPL FAQ docs misc -SUBDIRS = po tests +EXTRA_DIST = README.md COPYING.LGPL FAQ.md docs misc autogen.sh +SUBDIRS = po tests tests/fuzz CLEANFILES = DISTCLEAN_TARGETS = @@ -11,18 +11,29 @@ AM_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -DPREFIX=\""$(prefix)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DVERSION=\""$(VERSION)"\" + -DVERSION=\""$(VERSION)"\" \ + -DEXTERNAL_LUKS2_TOKENS_PATH=\"${EXTERNAL_LUKS2_TOKENS_PATH}\" AM_CFLAGS = -Wall -fPIE +AM_CXXFLAGS = -Wall AM_LDFLAGS = -pie -LDADD = $(LTLIBINTL) -lm +if ENABLE_FUZZ_TARGETS +AM_CFLAGS += -fsanitize=fuzzer-no-link +AM_CXXFLAGS += -fsanitize=fuzzer-no-link +endif + +LDADD = $(LTLIBINTL) tmpfilesddir = @DEFAULT_TMPFILESDIR@ +include_HEADERS = +lib_LTLIBRARIES = noinst_LTLIBRARIES = sbin_PROGRAMS = man8_MANS = tmpfilesd_DATA = +pkgconfig_DATA = +dist_noinst_DATA = include man/Makemodule.am @@ -35,12 +46,14 @@ include lib/crypto_backend/Makemodule.am include lib/Makemodule.am include src/Makemodule.am +include tokens/Makemodule.am ACLOCAL_AMFLAGS = -I m4 DISTCHECK_CONFIGURE_FLAGS = \ --with-tmpfilesdir=$$dc_install_base/usr/lib/tmpfiles.d \ - --enable-internal-argon2 --enable-internal-sse-argon2 + --enable-internal-argon2 --enable-internal-sse-argon2 \ + --enable-external-tokens --enable-ssh-token --enable-asciidoc distclean-local: -find . -name \*~ -o -name \*.orig -o -name \*.rej | xargs rm -f @@ -48,3 +61,17 @@ distclean-local: clean-local: -rm -rf docs/doxygen_api_docs libargon2.la + +install-data-local: + $(MKDIR_P) -m 0755 $(DESTDIR)/${EXTERNAL_LUKS2_TOKENS_PATH} + +uninstall-local: + rmdir $(DESTDIR)/${EXTERNAL_LUKS2_TOKENS_PATH} 2>/dev/null || : + +check-programs: libcryptsetup.la + $(MAKE) -C tests $@ + +if ENABLE_FUZZ_TARGETS +fuzz-targets: libcryptsetup.la libcrypto_backend.la + $(MAKE) -C tests/fuzz $@ +endif |