From bc47fe66932deda2124b70b426500a12dcbbd606 Mon Sep 17 00:00:00 2001 From: Juergen Repp Date: Wed, 17 Jan 2024 10:36:11 +0100 Subject: [PATCH] cirrus ci: Check race condition clean-hook is removed from Makefile.am. Signed-off-by: Juergen Repp --- Makefile.am | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index af0d83347..2327266f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,9 +55,16 @@ GITIGNOREFILES = "" if AUTOCONF_CODE_COVERAGE_2019_01_06 include $(top_srcdir)/aminclude_static.am clean-local: code-coverage-clean + -rm -r -f $(top_builddir)/ca distclean-local: code-coverage-dist-clean + -rm -r -f $(top_builddir)/ca else @CODE_COVERAGE_RULES@ +clean-local: + -rm -r -f $(top_builddir)/ca +distclean-local: + -rm -r -f $(top_builddir)/ca + endif GITIGNOREFILES += $(TSS_GITIGNOREFILES) CODE_COVERAGE_DIRECTORY = $(top_builddir)/src $(top_builddir)/test @@ -990,15 +997,11 @@ install-data-hook: install-dirs fi uninstall-local: - -rm -r -f $(top_builddir)/ca -rm $(DESTDIR)$(udevrulesdir)/$(udevrulesprefix)tpm-udev.rules cd $(DESTDIR)$(man3dir) && \ [ -L Tss2_TctiLdr_Initialize_Ex.3 ] && \ rm -f Tss2_TctiLdr_Initialize_Ex.3 || true -clean-hook: - -rm -r -f $(top_builddir)/ca - prepare-check: if INIT_CA $(top_srcdir)/script/ekca/init_ca.sh $(top_builddir) @@ -1037,7 +1040,10 @@ EXTRA_DIST += \ CLEANFILES += \ $(man3_MANS) \ - $(man7_MANS) + $(man7_MANS) \ + $(top_builddir)/ca + +DISTCLEANFILES += $(top_builddir)/ca # function to transform man .in files to man pages # $1: target