Merge pull request #4148 from BrianAker/master

Fix for make distcheck, maintainer-clean, to allow distribution builds.

Makefile.am

@@ -3,6 +3,7 @@ SUFFIXES =
 TESTS =
 CLEANFILES =
 DISTCLEANFILES =
+MAINTAINERCLEANFILES =
 bin_PROGRAMS =
 noinst_HEADERS =
 lib_LTLIBRARIES =
@@ -238,6 +239,12 @@ scripts/unit.log: testsuite/testsuite.log
 DISTCLEANFILES+= cyassl-config
 DISTCLEANFILES+= wolfssl-config
 
+MAINTAINERCLEANFILES+= wolfssl/wolfcrypt/async.h
+MAINTAINERCLEANFILES+= wolfssl/wolfcrypt/fips.h
+MAINTAINERCLEANFILES+= wolfssl/wolfcrypt/port/cavium/cavium_nitrox.h
+MAINTAINERCLEANFILES+= wolfssl/wolfcrypt/port/intel/quickassist.h
+MAINTAINERCLEANFILES+= wolfssl/wolfcrypt/port/intel/quickassist_mem.h
+
 SUBDIRS=$(SUBDIRS_OPT)
 DIST_SUBDIRS=$(DIST_SUBDIRS_OPT)
 

configure.ac

@@ -6436,6 +6436,17 @@ AC_CONFIG_FILES([scripts/unit.test],[chmod +x scripts/unit.test])
 AX_CREATE_GENERIC_CONFIG
 AX_AM_JOBSERVER([yes])
 
+# See Automake 9.4.1 Built Sources Example
+AC_DEFUN([AX_OUT_OF_TREE_FILE],[
+  AC_CONFIG_COMMANDS([$1], [test ! -f $srcdir/$1 && >> $srcdir/$1])
+])
+
+AX_OUT_OF_TREE_FILE([wolfssl/wolfcrypt/async.h])
+AX_OUT_OF_TREE_FILE([wolfssl/wolfcrypt/fips.h])
+AX_OUT_OF_TREE_FILE([wolfssl/wolfcrypt/port/cavium/cavium_nitrox.h])
+AX_OUT_OF_TREE_FILE([wolfssl/wolfcrypt/port/intel/quickassist.h])
+AX_OUT_OF_TREE_FILE([wolfssl/wolfcrypt/port/intel/quickassist_mem.h])
+
 AC_OUTPUT
 
 

src/include.am

@@ -2,6 +2,48 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
+BUILT_SOURCES+= ctaocrypt/src/fips.c
+BUILT_SOURCES+= ctaocrypt/src/fips_test.c
+BUILT_SOURCES+= wolfcrypt/src/async.c
+BUILT_SOURCES+= wolfcrypt/src/fips.c
+BUILT_SOURCES+= wolfcrypt/src/fips_test.c
+BUILT_SOURCES+= wolfcrypt/src/selftest.c
+BUILT_SOURCES+= wolfcrypt/src/wolfcrypt_first.c
+BUILT_SOURCES+= wolfcrypt/src/wolfcrypt_last.c
+
+MAINTAINERCLEANFILES+= ctaocrypt/src/fips.c
+MAINTAINERCLEANFILES+= ctaocrypt/src/fips_test.c
+MAINTAINERCLEANFILES+= wolfcrypt/src/async.c
+MAINTAINERCLEANFILES+= wolfcrypt/src/fips.c
+MAINTAINERCLEANFILES+= wolfcrypt/src/fips_test.c
+MAINTAINERCLEANFILES+= wolfcrypt/src/selftest.c
+MAINTAINERCLEANFILES+= wolfcrypt/src/wolfcrypt_first.c
+MAINTAINERCLEANFILES+= wolfcrypt/src/wolfcrypt_last.c
+
+ctaocrypt/src/fips.c: Makefile
+	touch $(srcdir)/$@
+
+ctaocrypt/src/fips_test.c: Makefile
+	touch $(srcdir)/$@
+
+wolfcrypt/src/async.c: Makefile
+	touch $(srcdir)/$@
+
+wolfcrypt/src/fips.c: Makefile
+	touch $(srcdir)/$@
+
+wolfcrypt/src/fips_test.c: Makefile
+	touch $(srcdir)/$@
+
+wolfcrypt/src/selftest.c: Makefile
+	touch $(srcdir)/$@
+
+wolfcrypt/src/wolfcrypt_first.c: Makefile
+	touch $(srcdir)/$@
+
+wolfcrypt/src/wolfcrypt_last.c: Makefile
+	touch $(srcdir)/$@
+
 if !BUILD_NO_LIBRARY
 lib_LTLIBRARIES+= src/libwolfssl.la
 endif

wolfcrypt/src/include.am

@@ -1,6 +1,14 @@
 # vim:ft=automake
 # All paths should be given relative to the root
 
+BUILT_SOURCES+= wolfcrypt/src/port/cavium/cavium_nitrox.c
+BUILT_SOURCES+= wolfcrypt/src/port/intel/quickassist.c
+BUILT_SOURCES+= wolfcrypt/src/port/intel/quickassist_mem.c
+
+MAINTAINERCLEANFILES+= wolfcrypt/src/port/cavium/cavium_nitrox.c
+MAINTAINERCLEANFILES+= wolfcrypt/src/port/intel/quickassist.c
+MAINTAINERCLEANFILES+= wolfcrypt/src/port/intel/quickassist_mem.c
+
 EXTRA_DIST += src/bio.c
 EXTRA_DIST += wolfcrypt/src/misc.c
 EXTRA_DIST += wolfcrypt/src/evp.c
@@ -101,6 +109,14 @@ EXTRA_DIST += wolfcrypt/src/port/ti/ti-aes.c \
               wolfcrypt/src/port/Renesas/README.md \
               wolfcrypt/src/port/cypress/psoc6_crypto.c
 
+wolfcrypt/src/port/cavium/cavium_nitrox.c: Makefile
+	touch $(srcdir)/$@
+
+wolfcrypt/src/port/intel/quickassist.c: Makefile
+	touch $(srcdir)/$@
+
+wolfcrypt/src/port/intel/quickassist_mem.c: Makefile
+	touch $(srcdir)/$@
 
 if BUILD_CRYPTOCB
 src_libwolfssl_la_SOURCES += wolfcrypt/src/cryptocb.c