From 52cdf85e265768d489aad611802075b0f01b3c38 Mon Sep 17 00:00:00 2001 From: toddouska Date: Wed, 14 Oct 2015 09:18:05 -0700 Subject: [PATCH] move touch fips files for non fips distribution to autogen.sh for cleaner autoconf handling --- Makefile.am | 3 --- autogen.sh | 3 +++ configure.ac | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 65b4d3d82..f3ad8ecd5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -113,9 +113,6 @@ tests/unit.log: testsuite/testsuite.log DISTCLEANFILES+= cyassl-config DISTCLEANFILES+= wolfssl-config -# fips files shouldn't be left after make distclean -DISTCLEANFILES+= ctaocrypt/src/fips.c -DISTCLEANFILES+= ctaocrypt/src/fips_test.c maintainer-clean-local: -rm Makefile.in diff --git a/autogen.sh b/autogen.sh index 89e475c0b..196764e1f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -15,6 +15,9 @@ fi # If this is a source checkout then call autoreconf with error as well if test -d .git; then WARNINGS="all,error" + # touch fips files for non fips distribution + touch ./ctaocrypt/src/fips.c + touch ./ctaocrypt/src/fips_test.c else WARNINGS="all" fi diff --git a/configure.ac b/configure.ac index 726181904..0c505b85b 100644 --- a/configure.ac +++ b/configure.ac @@ -2319,11 +2319,6 @@ AC_OUTPUT echo "---" echo "Running make clean..." make clean >/dev/null 2>&1 -# Touch files that may not be in repository -echo "Touching File..." -touch ctaocrypt/src/fips.c -touch ctaocrypt/src/fips_test.c -echo # generate user options header echo "---"