build: cleanup Makefile-fuzz.am

Added generated files to CLEANUPFILES to hane make clean them
make clean. Added la_LIBADD var for libfuzz_utils.la and
FUZZ_LDADD for FUZZ_PROGRAMS.

Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>

2 files changed, 16 insertions, 7 deletions

diff --git a/Makefile-fuzz.am b/Makefile-fuzz.am
index 390ee05b..719a4898 100644
--- a/Makefile-fuzz.am
+++ b/Makefile-fuzz.am
@@ -5,6 +5,7 @@
 TEST_EXTENSIONS += .fuzz
 FUZZ_LOG_COMPILER = $(srcdir)/script/fuzz-log-compiler.sh
 INCLUDE_DIRS += -I$(srcdir)/test/fuzz/tcti
+TESTS_LIBADD = $(lib_LTLIBRARIES) $(libtss2_mu) $(libtss2_sys) $(libutil)
 
 # tcti library used for fuzzing
 if ENABLE_TCTI_FUZZING
@@ -12,7 +13,7 @@ libtss2_tcti_fuzzing = test/fuzz/tcti/libtss2-tcti-fuzzing.la
 noinst_LTLIBRARIES += $(libtss2_tcti_fuzzing)
 
 test_fuzz_tcti_libtss2_tcti_fuzzing_la_CFLAGS   = $(AM_CFLAGS)
-test_fuzz_tcti_libtss2_tcti_fuzzing_la_LIBADD   = $(libtss2_mu) $(libutil)
+test_fuzz_tcti_libtss2_tcti_fuzzing_la_LIBADD   = $(TESTS_LIBADD)
 test_fuzz_tcti_libtss2_tcti_fuzzing_la_SOURCES  = \
     src/tss2-tcti/tcti-common.c src/tss2-tcti/tcti-common.h \
     test/fuzz/tcti/tcti-fuzzing.c test/fuzz/tcti/tcti-fuzzing.h
@@ -20,16 +21,20 @@ endif # ENABLE_TCTI_FUZZING
 
 if ENABLE_FUZZING
 FUZZ_CFLAGS = $(TESTS_CFLAGS) -I$(srcdir)/test/integration
-FUZZ_CPPFLAGS = $(INCLUDE_DIRS) -I$(srcdir)/test/integration \
-  $(LIB_FUZZING_ENGINE)
-FUZZ_LDADD = $(TESTS_LDADD) $(FUZZ_LDFLAGS)
+FUZZ_CPPFLAGS = $(INCLUDE_DIRS) -I$(srcdir)/test/integration $(LIB_FUZZING_ENGINE)
 
-noinst_LTLIBRARIES += test/fuzz/libfuzz_utils.la
+libtss2_utils_fuzzing = test/fuzz/libfuzz_utils.la
+noinst_LTLIBRARIES += $(libtss2_utils_fuzzing)
+test_fuzz_libfuzz_utils_la_LDFLAGS = $(TESTS_LDFLAGS)
+test_fuzz_libfuzz_utils_la_LIBADD = $(TESTS_LIBADD)
 test_fuzz_libfuzz_utils_la_CFLAGS = $(AM_CFLAGS) $(FUZZ_CFLAGS)
 test_fuzz_libfuzz_utils_la_SOURCES = \
     test/integration/sapi-context-util.c test/integration/context-util.h \
     test/integration/sapi-test-options.c test/integration/test-options.h
 
+TESTS_LDADD += $(libtss2_utils_fuzzing)
+FUZZ_LDADD = $(TESTS_LDADD) $(TESTS_LDFLAGS) $(FUZZ_LDFLAGS)
+
 fuzzdir = $(srcdir)
 fuzz-targets: $(fuzz_PROGRAMS)
 
@@ -37,5 +42,7 @@ check_PROGRAMS += $(TESTS_FUZZ)
 fuzz_PROGRAMS = $(TESTS_FUZZ)
 FUZZ = $(check_PROGRAMS)
 
+DISTCLEANFILES = Makefile-fuzz-generated.am
+
 include Makefile-fuzz-generated.am
 endif # ENABLE_FUZZING
diff --git a/script/gen_fuzz.py b/script/gen_fuzz.py
index b338273e..4ee68c1e 100755
--- a/script/gen_fuzz.py
+++ b/script/gen_fuzz.py
@@ -20,7 +20,9 @@ noinst_PROGRAMS += test/fuzz/%s.fuzz
 test_fuzz_%s_fuzz_CPPFLAGS = $(FUZZ_CPPFLAGS)
 test_fuzz_%s_fuzz_LDADD    = $(FUZZ_LDADD)
 test_fuzz_%s_fuzz_SOURCES  = test/fuzz/main-sapi.cpp \\
-        test/fuzz/%s.fuzz.cpp'''
+        test/fuzz/%s.fuzz.cpp
+
+DISTCLEANFILES += test/fuzz/%s.fuzz.cpp'''
 # Common include definitions needed for fuzzing an SAPI call
 SAPI_TEMPLATE_HEADER = '''/* SPDX-License-Identifier: BSD-2 */
 /***********************************************************************
@@ -225,7 +227,7 @@ def main():
                               for function in functions])
     # Create the Makefile targets for each generated file
     targets = '\n'.join([MAKEFILE_FUZZ_TARGET % tuple(list(itertools.chain(\
-            ([function] * 5)))) for function in functions])
+            ([function] * 6)))) for function in functions])
     # Write out the Makefile-fuzz-generated.am file
     with open('Makefile-fuzz-generated.am', 'w') as makefile_fd:
         makefile_fd.write(MAKEFILE_FUZZ % (files, targets))