code coverage changes CFLAGS directly

m4/code-coverage.m4

@@ -39,10 +39,7 @@ AC_DEFUN([AX_CODE_COVERAGE], [
 		changequote([,])
 	
 		dnl Add the coverage flags (clang, gcc)
-		CODE_COVERAGE_CFLAGS="--coverage"
-		CODE_COVERAGE_LDFLAGS="--coverage"
-		
-		AC_SUBST([CODE_COVERAGE_CFLAGS])
-		AC_SUBST([CODE_COVERAGE_LDFLAGS])
+		CFLAGS="$CFLAGS --coverage"
+		LDFLAGS="$LDFLAGS --coverage"
 	])
 ]) # AC_CODE_COVERAGE

src/Makefile.am

@@ -14,9 +14,6 @@ AM_CPPFLAGS = \
 	-DRUN_DIR='"${run_dir}"'		\
 	-I$(srcdir)/dnssec/lib
 
-AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
-AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
-
 ######################
 # Knot DNS Libraries #
 ######################

src/contrib/dnstap/Makefile.am

@@ -20,11 +20,9 @@ SUFFIXES = .proto .pb-c.c .pb-c.h
 noinst_LTLIBRARIES = libdnstap.la
 
 libdnstap_la_CFLAGS =			\
-	$(CODE_COVERAGE_CFLAGS)		\
 	$(DNSTAP_CFLAGS)
 
 libdnstap_la_LDFLAGS =			\
-	$(CODE_COVERAGE_LDFLAGS)	\
 	$(DNSTAP_LIBS)
 
 libdnstap_la_SOURCES =			\

src/dnssec/Makefile.am

@@ -6,13 +6,9 @@ AM_CPPFLAGS = \
 	-I$(srcdir)/lib \
 	-I$(srcdir)/lib/dnssec \
 	-I$(top_srcdir)/src \
-	$(CODE_COVERAGE_CFLAGS) \
 	$(gnutls_CFLAGS) \
 	$(jansson_CFLAGS)
 
-AM_LDFLAGS = \
-	$(CODE_COVERAGE_LDFLAGS)
-
 noinst_LTLIBRARIES = libshared.la
 lib_LTLIBRARIES = libdnssec.la
 

src/dnssec/tests/Makefile.am

@@ -4,11 +4,9 @@ AM_CPPFLAGS = \
 	-I$(srcdir)/../shared \
 	-I$(srcdir)/../lib \
 	-I$(srcdir)/../lib/dnssec \
-	$(CODE_COVERAGE_CFLAGS) \
 	$(gnutls_CFLAGS)
 
 AM_LDFLAGS = \
-	$(CODE_COVERAGE_LDFLAGS) \
 	-static
 
 LDADD = \

src/dnssec/utils/Makefile.am

@@ -8,11 +8,7 @@ AM_CPPFLAGS = \
 	-I$(srcdir)/../lib/dnssec \
 	-I$(srcdir)/../lib \
 	-I$(top_srcdir)/src \
-	$(gnutls_CFLAGS) \
-	$(CODE_COVERAGE_CFLAGS)
-
-AM_LDFLAGS = \
-	$(CODE_COVERAGE_LDFLAGS)
+	$(gnutls_CFLAGS)
 
 libutils_la_LIBADD = \
 	$(builddir)/../libdnssec.la \

src/zscanner/Makefile.am

@@ -42,9 +42,7 @@ nodist_libzscanner_la_SOURCES =		\
 	scanner.c
 
 libzscanner_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY)
-libzscanner_la_CFLAGS = $(CODE_COVERAGE_CFLAGS)
 libzscanner_la_LDFLAGS =		\
-	$(CODE_COVERAGE_LDFLAGS)	\
 	$(libzscanner_VERSION_INFO)
 
 include $(srcdir)/tests/Makefile.inc

src/zscanner/tests/Makefile.inc

 LDADD = \
 	$(top_builddir)/src/zscanner/libzscanner.la
 
-
-
 tests_zscanner_tool_SOURCES = \
 	tests/zscanner-tool.c	\
 	tests/tests.h		\
@@ -10,8 +8,6 @@ tests_zscanner_tool_SOURCES = \
 	tests/processing.h	\
 	tests/processing.c
 
-tests_zscanner_tool_CFLAGS = $(CODE_COVERAGE_CFLAGS)
-
 check_PROGRAMS = \
 	tests/zscanner-tool
 

tests-fuzz/Makefile.am

@@ -3,8 +3,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/dnssec/lib
 
-AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
-
 LDADD = \
 	$(top_builddir)/src/libknot.la
 

tests/Makefile.am

@@ -4,8 +4,6 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/dnssec/lib
 
-AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
-
 LDADD = \
 	$(top_builddir)/libtap/libtap.la \
 	$(top_builddir)/src/libknot.la \