From: Jeremy Sowden <jeremy@azazel.net>
Date: Fri, 18 Aug 2023 12:38:15 +0000 (+0200)
Subject: build: replace `AM_V_silent` with `AM_V_at`
X-Git-Tag: v3.25~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ada670ee2106463b89968720d71ecdce52236b5d;p=thirdparty%2Fxtables-addons.git

build: replace `AM_V_silent` with `AM_V_at`

`AM_V_silent` was buggy and defined in the wrong place.  Replace it with
`AM_V_at`, which is provided by automake for the same purpose.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---

diff --git a/Makefile.iptrules.in b/Makefile.iptrules.in
index fcac885..f2f202a 100644
--- a/Makefile.iptrules.in
+++ b/Makefile.iptrules.in
@@ -21,15 +21,12 @@ AM_DEFAULT_VERBOSITY = 0
 am__v_CC_0           = @echo "  CC    " $@;
 am__v_CCLD_0         = @echo "  CCLD  " $@;
 am__v_GEN_0          = @echo "  GEN   " $@;
-am__v_SILENT_0       = @
 am__v_CC_            = ${am__v_CC_${AM_DEFAULT_VERBOSITY}}
 am__v_CCLD_          = ${am__v_CCLD_${AM_DEFAULT_VERBOSITY}}
 am__v_GEN_           = ${am__v_GEN_${AM_DEFAULT_VERBOSITY}}
-am__v_SILENT_        = ${am__v_SILENT_${AM_DEFAULT_VERBOSITY}}
 AM_V_CC              = ${am__v_CC_${V}}
 AM_V_CCLD            = ${am__v_CCLD_${V}}
 AM_V_GEN             = ${am__v_GEN_${V}}
-AM_V_silent          = ${am__v_GEN_${V}}
 
 include ${XA_TOPSRCDIR}/mconfig
 -include ${XA_TOPSRCDIR}/mconfig.*
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 2b7f5f4..8f0aeb5 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -12,13 +12,13 @@ _kcall = -C ${kbuilddir} M=${abs_srcdir}
 modules:
 	@echo -n "Xtables-addons ${PACKAGE_VERSION} - Linux "
 	@if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} --no-print-directory -s kernelrelease; fi;
-	${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} modules; fi;
+	${AM_V_at}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} modules; fi;
 
 modules_install:
-	${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} INSTALL_MOD_PATH=${DESTDIR} ext-mod-dir='$${INSTALL_MOD_DIR}' modules_install; fi;
+	${AM_V_at}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} INSTALL_MOD_PATH=${DESTDIR} ext-mod-dir='$${INSTALL_MOD_DIR}' modules_install; fi;
 
 clean_modules:
-	${AM_V_silent}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} clean; fi;
+	${AM_V_at}if [ -n "${kbuilddir}" ]; then ${MAKE} ${_kcall} clean; fi;
 
 all-local: modules