automake: fix fips touch and cleanup

This fixes an issue with yocto that only occurs when using `devtool`
which builds out of tree.
This commit is contained in:
elms
2022-02-10 13:13:24 -08:00
parent 666cf508a2
commit d1895e5679
2 changed files with 22 additions and 52 deletions

View File

@ -2,47 +2,22 @@
# included from Top Level Makefile.am # included from Top Level Makefile.am
# All paths should be given relative to the root # All paths should be given relative to the root
BUILT_SOURCES+= ctaocrypt/src/fips.c FIPS_FILES = \
BUILT_SOURCES+= ctaocrypt/src/fips_test.c ctaocrypt/src/fips.c \
BUILT_SOURCES+= wolfcrypt/src/async.c ctaocrypt/src/fips_test.c \
BUILT_SOURCES+= wolfcrypt/src/fips.c wolfcrypt/src/async.c \
BUILT_SOURCES+= wolfcrypt/src/fips_test.c wolfcrypt/src/fips.c \
BUILT_SOURCES+= wolfcrypt/src/selftest.c wolfcrypt/src/fips_test.c \
BUILT_SOURCES+= wolfcrypt/src/wolfcrypt_first.c wolfcrypt/src/selftest.c \
BUILT_SOURCES+= wolfcrypt/src/wolfcrypt_last.c wolfcrypt/src/wolfcrypt_first.c \
wolfcrypt/src/wolfcrypt_last.c
MAINTAINERCLEANFILES+= ctaocrypt/src/fips.c BUILT_SOURCES+= $(FIPS_FILES)
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 MAINTAINERCLEANFILES+= $(FIPS_FILES)
@test -e $(srcdir)/$@ || touch $(srcdir)/$@
ctaocrypt/src/fips_test.c: Makefile $(FIPS_FILES):
@test -e $(srcdir)/$@ || touch $(srcdir)/$@ $(AM_V_at)touch $(srcdir)/$@
wolfcrypt/src/async.c: Makefile
@test -e $(srcdir)/$@ || touch $(srcdir)/$@
wolfcrypt/src/fips.c: Makefile
@test -e $(srcdir)/$@ || touch $(srcdir)/$@
wolfcrypt/src/fips_test.c: Makefile
@test -e $(srcdir)/$@ || touch $(srcdir)/$@
wolfcrypt/src/selftest.c: Makefile
@test -e $(srcdir)/$@ || touch $(srcdir)/$@
wolfcrypt/src/wolfcrypt_first.c: Makefile
@test -e $(srcdir)/$@ || touch $(srcdir)/$@
wolfcrypt/src/wolfcrypt_last.c: Makefile
@test -e $(srcdir)/$@ || touch $(srcdir)/$@
if !BUILD_NO_LIBRARY if !BUILD_NO_LIBRARY
lib_LTLIBRARIES+= src/libwolfssl.la lib_LTLIBRARIES+= src/libwolfssl.la

View File

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