From patchwork Thu Dec 14 12:59:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1876181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20220717 header.b=NgTYHgou; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:45e3:2400::1; helo=sv.mirrors.kernel.org; envelope-from=netfilter-devel+bounces-341-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [IPv6:2604:1380:45e3:2400::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SrXW907Wlz23nn for ; Thu, 14 Dec 2023 23:59:48 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 49234283205 for ; Thu, 14 Dec 2023 12:59:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 54E204F217; Thu, 14 Dec 2023 12:59:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=azazel.net header.i=@azazel.net header.b="NgTYHgou" X-Original-To: netfilter-devel@vger.kernel.org Received: from azazel.net (unknown [IPv6:2a05:d01c:431:aa03:b7e1:333d:ea2a:b14e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 491E5113 for ; Thu, 14 Dec 2023 04:59:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20220717; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=j4ZlDOe+f2JRDu8UIynnR9NFfdbKktTLMk/okOZtq7E=; b=NgTYHgou04D4wKowQVQgl8RUN9 o/2twH4GPdmGJEyYA1s29gMh7RDVaDQR/jYp81hKB0oJL70zfVJTXCjr5jvIloqvTiMvU/rV3bHT7 jGDGV9fFbOU0D6XKGoDD7B4IOHQXCwt2nHhD2A1O2BcVW3aLvX9wPaGQegqxZZKpMS28DgJqwWIuA +xEuknzmciXe6oIMwqZz0Xu4t04P6cMQBRxK5ui2NY48V0zijV5SeJuNx/GjqSJVM6v+LJxzr11DD 6UUCoVamCBm1YvX2T08Fl4rTE3wZcZNXpsOTXd0yEJ3Bi0ctHz/mv6EH6OD3muBTIMgcEI6VKcL6t A/Bqcypg==; Received: from [2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608] (helo=ulthar.dreamlands) by taras.nevrast.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rDlJN-0032wj-1o for netfilter-devel@vger.kernel.org; Thu, 14 Dec 2023 12:59:33 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH iptables 1/7] build: format `AM_CPPFLAGS` variables Date: Thu, 14 Dec 2023 12:59:16 +0000 Message-ID: <20231214125927.925993-2-jeremy@azazel.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231214125927.925993-1-jeremy@azazel.net> References: <20231214125927.925993-1-jeremy@azazel.net> Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608 X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on taras.nevrast.org); SAEximRunCond expanded to false Signed-off-by: Jeremy Sowden --- extensions/GNUmakefile.in | 10 +++++++++- iptables/Makefile.am | 9 ++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index e289adf06547..40bcec7999ae 100644 --- a/extensions/GNUmakefile.in +++ b/extensions/GNUmakefile.in @@ -22,7 +22,15 @@ regular_CPPFLAGS = @regular_CPPFLAGS@ kinclude_CPPFLAGS = @kinclude_CPPFLAGS@ AM_CFLAGS = ${regular_CFLAGS} -AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include -I${top_srcdir} ${kinclude_CPPFLAGS} ${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@ @libnftnl_CFLAGS@ +AM_CPPFLAGS = ${regular_CPPFLAGS} \ + -I${top_builddir}/include \ + -I${top_builddir} \ + -I${top_srcdir}/include \ + -I${top_srcdir} \ + ${kinclude_CPPFLAGS} \ + ${CPPFLAGS} \ + @libnetfilter_conntrack_CFLAGS@ \ + @libnftnl_CFLAGS@ AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ AM_LDFLAGS = @noundef_LDFLAGS@ @regular_LDFLAGS@ diff --git a/iptables/Makefile.am b/iptables/Makefile.am index 0f8b430c2021..31d4b48624cb 100644 --- a/iptables/Makefile.am +++ b/iptables/Makefile.am @@ -1,7 +1,14 @@ # -*- Makefile -*- AM_CFLAGS = ${regular_CFLAGS} -AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include -I${top_srcdir} ${kinclude_CPPFLAGS} ${libmnl_CFLAGS} ${libnftnl_CFLAGS} ${libnetfilter_conntrack_CFLAGS} +AM_CPPFLAGS = ${regular_CPPFLAGS} \ + -I${top_builddir}/include \ + -I${top_srcdir}/include \ + -I${top_srcdir} \ + ${kinclude_CPPFLAGS} \ + ${libmnl_CFLAGS} \ + ${libnftnl_CFLAGS} \ + ${libnetfilter_conntrack_CFLAGS} AM_LDFLAGS = ${regular_LDFLAGS} BUILT_SOURCES = From patchwork Thu Dec 14 12:59:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1876180 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20220717 header.b=DBthfKTT; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:40f1:3f00::1; helo=sy.mirrors.kernel.org; envelope-from=netfilter-devel+bounces-340-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org [IPv6:2604:1380:40f1:3f00::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SrXW75g9cz23nm for ; Thu, 14 Dec 2023 23:59:47 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id A064EB210D4 for ; Thu, 14 Dec 2023 12:59:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8FEA64EB5E; Thu, 14 Dec 2023 12:59:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=azazel.net header.i=@azazel.net header.b="DBthfKTT" X-Original-To: netfilter-devel@vger.kernel.org Received: from azazel.net (unknown [IPv6:2a05:d01c:431:aa03:b7e1:333d:ea2a:b14e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7760A116 for ; Thu, 14 Dec 2023 04:59:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20220717; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=upReZHkA5rxf9OVI1F0LW/69k6j+8yjL8deHHMN3N1w=; b=DBthfKTTcLsjIbqEH+DizNd/wP vRd4k0hkEx0yM6GX4EbMBec3B7Y6SCybSPV32JydtCwHoXKqWyC77l6mu5GygFP2QsmOphZtHYy43 davQGwxgGXX0UhCxhKxm9cfDz2iJm/zfnBjZOZ5tFD9CNXikuyEIj9OrRVvYa92LAyiYA1k9O1KaM N0xam+V3jQKX03PUmhlYv07rq8WQM8LeoCIMf8D+bW6xseLc6m7bx3rUoePv+PFZqC8zfMOCpRLQ6 Dh1zDR08Y6FWZ21HgarIU2QVd7x3pUUCgWhviQMT/QebZ4uRxcSydsEdk34Rd6Olh3fxuyXHgzCF9 kq8mTr8Q==; Received: from [2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608] (helo=ulthar.dreamlands) by taras.nevrast.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rDlJN-0032wj-1w for netfilter-devel@vger.kernel.org; Thu, 14 Dec 2023 12:59:33 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH iptables 2/7] build: remove obsolete `AM_LIBTOOL_SILENT` variable Date: Thu, 14 Dec 2023 12:59:17 +0000 Message-ID: <20231214125927.925993-3-jeremy@azazel.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231214125927.925993-1-jeremy@azazel.net> References: <20231214125927.925993-1-jeremy@azazel.net> Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608 X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on taras.nevrast.org); SAEximRunCond expanded to false It doesn't do anything, so get rid of it. Signed-off-by: Jeremy Sowden --- extensions/GNUmakefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index 40bcec7999ae..53011fc8c2bb 100644 --- a/extensions/GNUmakefile.in +++ b/extensions/GNUmakefile.in @@ -35,7 +35,6 @@ AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ AM_LDFLAGS = @noundef_LDFLAGS@ @regular_LDFLAGS@ ifeq (${V},) -AM_LIBTOOL_SILENT = --silent AM_VERBOSE_CC = @echo " CC " $@; AM_VERBOSE_CCLD = @echo " CCLD " $@; AM_VERBOSE_CXX = @echo " CXX " $@; From patchwork Thu Dec 14 12:59:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1876186 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20220717 header.b=L5obAXNT; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=147.75.48.161; helo=sy.mirrors.kernel.org; envelope-from=netfilter-devel+bounces-346-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org [147.75.48.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SrXWL5rgWz23nm for ; Thu, 14 Dec 2023 23:59:58 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 984E5B212B2 for ; Thu, 14 Dec 2023 12:59:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 919E94F1E1; Thu, 14 Dec 2023 12:59:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=azazel.net header.i=@azazel.net header.b="L5obAXNT" X-Original-To: netfilter-devel@vger.kernel.org Received: from azazel.net (unknown [IPv6:2a05:d01c:431:aa03:b7e1:333d:ea2a:b14e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 776A8118 for ; Thu, 14 Dec 2023 04:59:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20220717; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=2t0e+IQFzHkiT46I+zwxwNceQ7/AQ16DNL2CzaCCDD4=; b=L5obAXNTSA0wZx2OCiFg6msV7s S0J2329vYQaJkCax7D5wC16K4u6jWPVy9piX0vs44nnAro//Fd4AMrOjxocGwAgTb9tihn415s1Ue zqdgHK2orAo3fM+OOZGNnXdw0zcdeCTQDsANvBFAdW9E/g9GqH2t735Pj+DWYIK930N7LL8MgAJWM wgLGc27EqvpChTlin6t0bBHWomcUhCGmjgThI0Imow9rzYfJrHz3h7qaIa/sC0olR+Qi22ImJDD40 qJcyZSc1z7Aek9XlKWADwUhpyJY89AgO8VFK1AX5zOnCurv4SIX6xviBrH/OrWUwKxY20dQ/2/1w/ fh+TNBUw==; Received: from [2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608] (helo=ulthar.dreamlands) by taras.nevrast.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rDlJN-0032wj-26 for netfilter-devel@vger.kernel.org; Thu, 14 Dec 2023 12:59:33 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH iptables 3/7] build: remove unused `AM_VERBOSE_CXX*` variables Date: Thu, 14 Dec 2023 12:59:18 +0000 Message-ID: <20231214125927.925993-4-jeremy@azazel.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231214125927.925993-1-jeremy@azazel.net> References: <20231214125927.925993-1-jeremy@azazel.net> Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608 X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on taras.nevrast.org); SAEximRunCond expanded to false There is no C++, so these variables are not required. Signed-off-by: Jeremy Sowden --- extensions/GNUmakefile.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index 53011fc8c2bb..51b18a59a580 100644 --- a/extensions/GNUmakefile.in +++ b/extensions/GNUmakefile.in @@ -37,8 +37,6 @@ AM_LDFLAGS = @noundef_LDFLAGS@ @regular_LDFLAGS@ ifeq (${V},) AM_VERBOSE_CC = @echo " CC " $@; AM_VERBOSE_CCLD = @echo " CCLD " $@; -AM_VERBOSE_CXX = @echo " CXX " $@; -AM_VERBOSE_CXXLD = @echo " CXXLD " $@; AM_VERBOSE_AR = @echo " AR " $@; AM_VERBOSE_GEN = @echo " GEN " $@; endif From patchwork Thu Dec 14 12:59:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1876187 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20220717 header.b=rtDRpk4G; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:4601:e00::3; helo=am.mirrors.kernel.org; envelope-from=netfilter-devel+bounces-347-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [IPv6:2604:1380:4601:e00::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SrXWS0MYNz23nn for ; Fri, 15 Dec 2023 00:00:03 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id A68BB1F21AD5 for ; Thu, 14 Dec 2023 13:00:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B26D454789; Thu, 14 Dec 2023 12:59:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=azazel.net header.i=@azazel.net header.b="rtDRpk4G" X-Original-To: netfilter-devel@vger.kernel.org Received: from azazel.net (unknown [IPv6:2a05:d01c:431:aa03:b7e1:333d:ea2a:b14e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77A39120 for ; Thu, 14 Dec 2023 04:59:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20220717; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=/aad97Sfk9PzLlLRCQpm4opoE08ThxPtRJaDTbYakoA=; b=rtDRpk4GrSiG4ADMczGXdOa+TD AU7ig41WySipg84sowI/jyU4rLu8lyYZeoMfsvmCYE2TCjtYqtOGZ7SSuKdOOUFgHfDIzQcYI1C8i ElYmes7ZBg8fHIS7D+UXtsn3vJcR5hMNCpTHHZYxgQFzuhpT2EuBIFj1MC1vjOPVvgfv0CGqx2M5A dEQCNxqvVB/k+Z3WD2JUMhSRUua7lpd18D1U9KVCcpt9m+qODwO/rDlBd1mfr/4xygzl3jP1b+aH7 AxMFY0T5mGzj5BzFxSEy5JjRH+vv3G3XHDWx3MgOUNjMqjwvSBPTqpd3Ip8/hYbS3Lql0imJ9HZhZ mxYLmYUw==; Received: from [2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608] (helo=ulthar.dreamlands) by taras.nevrast.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rDlJN-0032wj-2F for netfilter-devel@vger.kernel.org; Thu, 14 Dec 2023 12:59:33 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH iptables 4/7] build: use standard automake verbosity variables Date: Thu, 14 Dec 2023 12:59:19 +0000 Message-ID: <20231214125927.925993-5-jeremy@azazel.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231214125927.925993-1-jeremy@azazel.net> References: <20231214125927.925993-1-jeremy@azazel.net> Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608 X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on taras.nevrast.org); SAEximRunCond expanded to false The previous implementation ignored the default verbosity defined by configure, and controlled by --{enable,disable}-silent-rules, and treated V="" as V=0. Instead, follow the guide-lines given in the automake manual. Signed-off-by: Jeremy Sowden --- extensions/GNUmakefile.in | 41 +++++++++++++++++++++++---------------- iptables/Makefile.am | 6 +++--- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index 51b18a59a580..f91ebf5e4e6e 100644 --- a/extensions/GNUmakefile.in +++ b/extensions/GNUmakefile.in @@ -34,12 +34,19 @@ AM_CPPFLAGS = ${regular_CPPFLAGS} \ AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ AM_LDFLAGS = @noundef_LDFLAGS@ @regular_LDFLAGS@ -ifeq (${V},) -AM_VERBOSE_CC = @echo " CC " $@; -AM_VERBOSE_CCLD = @echo " CCLD " $@; -AM_VERBOSE_AR = @echo " AR " $@; -AM_VERBOSE_GEN = @echo " GEN " $@; -endif +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +am__v_AR_0 = @echo " AR " $@; +am__v_CC_0 = @echo " CC " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_AR_ = ${am__v_AR_@AM_DEFAULT_V@} +am__v_CC_ = ${am__v_CC_@AM_DEFAULT_V@} +am__v_CCLD_ = ${am__v_CCLD_@AM_DEFAULT_V@} +am__v_GEN_ = ${am__v_GEN_@AM_DEFAULT_V@} +AM_V_AR = ${am__v_AR_@AM_V@} +AM_V_CC = ${am__v_CC_@AM_V@} +AM_V_CCLD = ${am__v_CCLD_@AM_V@} +AM_V_GEN = ${am__v_GEN_@AM_V@} # # Wildcard module list @@ -118,7 +125,7 @@ clean: distclean: clean init%.o: init%.c - ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=$*_init ${CFLAGS} -o $@ -c $<; + ${AM_V_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=$*_init ${CFLAGS} -o $@ -c $<; -include .*.d @@ -127,10 +134,10 @@ init%.o: init%.c # Shared libraries # lib%.so: lib%.oo - ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} ${LDFLAGS} -shared -o $@ $< -L../libxtables/.libs -lxtables ${$*_LIBADD}; + ${AM_V_CCLD} ${CCLD} ${AM_LDFLAGS} ${LDFLAGS} -shared -o $@ $< -L../libxtables/.libs -lxtables ${$*_LIBADD}; lib%.oo: ${srcdir}/lib%.c - ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<; + ${AM_V_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<; libxt_NOTRACK.so: libxt_CT.so ln -fs $< $@ @@ -158,22 +165,22 @@ xt_connlabel_LIBADD = @libnetfilter_conntrack_LIBS@ # handling code in the Makefiles. # lib%.o: ${srcdir}/lib%.c - ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -DNO_SHARED_LIBS=1 -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<; + ${AM_V_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -DNO_SHARED_LIBS=1 -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<; libext.a: initext.o ${libext_objs} - ${AM_VERBOSE_AR} ${AR} crs $@ $^; + ${AM_V_AR} ${AR} crs $@ $^; libext_ebt.a: initextb.o ${libext_ebt_objs} - ${AM_VERBOSE_AR} ${AR} crs $@ $^; + ${AM_V_AR} ${AR} crs $@ $^; libext_arpt.a: initexta.o ${libext_arpt_objs} - ${AM_VERBOSE_AR} ${AR} crs $@ $^; + ${AM_V_AR} ${AR} crs $@ $^; libext4.a: initext4.o ${libext4_objs} - ${AM_VERBOSE_AR} ${AR} crs $@ $^; + ${AM_V_AR} ${AR} crs $@ $^; libext6.a: initext6.o ${libext6_objs} - ${AM_VERBOSE_AR} ${AR} crs $@ $^; + ${AM_V_AR} ${AR} crs $@ $^; initext_func := $(addprefix xt_,${pfx_build_mod}) initextb_func := $(addprefix ebt_,${pfb_build_mod}) @@ -191,7 +198,7 @@ ${initext_depfiles}: FORCE rm -f $@.tmp; ${initext_sources}: %.c: .%.dd - ${AM_VERBOSE_GEN} + ${AM_V_GEN} @( \ initext_func="$(value $(basename $@)_func)"; \ funcname="init_extensions$(patsubst initext%.c,%,$@)"; \ @@ -214,7 +221,7 @@ ${initext_sources}: %.c: .%.dd ex_matches = $(shell echo ${1} | LC_ALL=POSIX grep -Eo '\b[[:lower:][:digit:]_]+\b') ex_targets = $(shell echo ${1} | LC_ALL=POSIX grep -Eo '\b[[:upper:][:digit:]_]+\b') man_run = \ - ${AM_VERBOSE_GEN} \ + ${AM_V_GEN} \ for ext in $(sort ${1}); do \ f="${srcdir}/libxt_$$ext.man"; \ if [ -f "$$f" ]; then \ diff --git a/iptables/Makefile.am b/iptables/Makefile.am index 31d4b48624cb..2007cd10260b 100644 --- a/iptables/Makefile.am +++ b/iptables/Makefile.am @@ -114,15 +114,15 @@ x_sbin_links = iptables-nft iptables-nft-restore iptables-nft-save \ endif iptables-extensions.8: iptables-extensions.8.tmpl ../extensions/matches.man ../extensions/targets.man - ${AM_VERBOSE_GEN} sed \ + ${AM_V_GEN} sed \ -e '/@MATCH@/ r ../extensions/matches.man' \ -e '/@TARGET@/ r ../extensions/targets.man' $< >$@; ${xlate_man_links}: - ${AM_VERBOSE_GEN} echo '.so man8/xtables-translate.8' >$@ + ${AM_V_GEN} echo '.so man8/xtables-translate.8' >$@ ip6tables.8 ip6tables-apply.8 ip6tables-restore.8 ip6tables-save.8: - ${AM_VERBOSE_GEN} echo "$@" | sed 's|^ip6|.so man8/ip|' >$@ + ${AM_V_GEN} echo "$@" | sed 's|^ip6|.so man8/ip|' >$@ pkgconfig_DATA = xtables.pc From patchwork Thu Dec 14 12:59:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1876184 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20220717 header.b=aTTrWBls; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:45d1:ec00::1; helo=ny.mirrors.kernel.org; envelope-from=netfilter-devel+bounces-344-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org [IPv6:2604:1380:45d1:ec00::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SrXWH6N6rz23nm for ; Thu, 14 Dec 2023 23:59:55 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 14D8D1C21A11 for ; Thu, 14 Dec 2023 12:59:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F12A052F91; Thu, 14 Dec 2023 12:59:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=azazel.net header.i=@azazel.net header.b="aTTrWBls" X-Original-To: netfilter-devel@vger.kernel.org Received: from azazel.net (unknown [IPv6:2a05:d01c:431:aa03:b7e1:333d:ea2a:b14e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B3C6115 for ; Thu, 14 Dec 2023 04:59:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20220717; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=oe0K+IXE2u5A2ukTey1u7Ej/nhqidC0FnUGJxqr59Hs=; b=aTTrWBlsyX5wUmb6qbegtiY2k0 HNeV/902oq+Wx8j6IgZ4bIr8j3DaOvg43fWwQxTarX2LzUUQjTthvDoIvEXR+lRlVDeFx+85NUmzO RaLoWxnXyeMhbOgrJk6BwHxWj6NS2rru0Q1pKfoRkk8Jp7/9reyUY5HyJgmz8HnDEpMREOjyuWkLL Yz+j19cHQgxieaDBcGtqdo0FU9ZFr2UcCJtrkhn/8/Oad5mPauQHrIE9vgB/IXSCq0STQZiQlVeGK 0DL/MJ1QgNmH1tSkmZs1v2efcuDgvCnEI1+HlH7PP76xE87NGHE1vlr7fb9TbQ7k1IW02b6KHiH6o OOyzqGKg==; Received: from [2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608] (helo=ulthar.dreamlands) by taras.nevrast.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rDlJN-0032wj-2P for netfilter-devel@vger.kernel.org; Thu, 14 Dec 2023 12:59:33 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH iptables 5/7] build: add an automake verbosity variable for `ln` Date: Thu, 14 Dec 2023 12:59:20 +0000 Message-ID: <20231214125927.925993-6-jeremy@azazel.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231214125927.925993-1-jeremy@azazel.net> References: <20231214125927.925993-1-jeremy@azazel.net> Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608 X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on taras.nevrast.org); SAEximRunCond expanded to false Signed-off-by: Jeremy Sowden --- extensions/GNUmakefile.in | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index f91ebf5e4e6e..dfa58c3b9e8b 100644 --- a/extensions/GNUmakefile.in +++ b/extensions/GNUmakefile.in @@ -39,14 +39,17 @@ am__v_AR_0 = @echo " AR " $@; am__v_CC_0 = @echo " CC " $@; am__v_CCLD_0 = @echo " CCLD " $@; am__v_GEN_0 = @echo " GEN " $@; +am__v_LN_0 = @echo " LN " $@; am__v_AR_ = ${am__v_AR_@AM_DEFAULT_V@} am__v_CC_ = ${am__v_CC_@AM_DEFAULT_V@} am__v_CCLD_ = ${am__v_CCLD_@AM_DEFAULT_V@} am__v_GEN_ = ${am__v_GEN_@AM_DEFAULT_V@} +am__v_LN_ = ${am__v_LN_@AM_DEFAULT_V@} AM_V_AR = ${am__v_AR_@AM_V@} AM_V_CC = ${am__v_CC_@AM_V@} AM_V_CCLD = ${am__v_CCLD_@AM_V@} AM_V_GEN = ${am__v_GEN_@AM_V@} +AM_V_LN = ${am__v_LN_@AM_V@} # # Wildcard module list @@ -140,17 +143,17 @@ lib%.oo: ${srcdir}/lib%.c ${AM_V_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<; libxt_NOTRACK.so: libxt_CT.so - ln -fs $< $@ + ${AM_V_LN} ln -fs $< $@ libxt_state.so: libxt_conntrack.so - ln -fs $< $@ + ${AM_V_LN} ln -fs $< $@ libxt_REDIRECT.so: libxt_NAT.so - ln -fs $< $@ + ${AM_V_LN} ln -fs $< $@ libxt_MASQUERADE.so: libxt_NAT.so - ln -fs $< $@ + ${AM_V_LN} ln -fs $< $@ libxt_SNAT.so: libxt_NAT.so - ln -fs $< $@ + ${AM_V_LN} ln -fs $< $@ libxt_DNAT.so: libxt_NAT.so - ln -fs $< $@ + ${AM_V_LN} ln -fs $< $@ # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD xt_RATEEST_LIBADD = -lm From patchwork Thu Dec 14 12:59:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1876185 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20220717 header.b=SWNH/0r0; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2604:1380:40f1:3f00::1; helo=sy.mirrors.kernel.org; envelope-from=netfilter-devel+bounces-345-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org [IPv6:2604:1380:40f1:3f00::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SrXWK6gpWz23nm for ; Thu, 14 Dec 2023 23:59:57 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 7E685B2188C for ; Thu, 14 Dec 2023 12:59:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 516BA53800; Thu, 14 Dec 2023 12:59:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=azazel.net header.i=@azazel.net header.b="SWNH/0r0" X-Original-To: netfilter-devel@vger.kernel.org Received: from azazel.net (unknown [IPv6:2a05:d01c:431:aa03:b7e1:333d:ea2a:b14e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 776EE11B for ; Thu, 14 Dec 2023 04:59:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20220717; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=oBkoWERwtOak9pa8jZ7dwPOwmsjB8eSDe5Kf2KXTmac=; b=SWNH/0r0oh7esvASkRs3UE59pL 5gWTx4ofBS6NSlNnPInznbM/VRMlJPjv2oNWqzx4UbRzISBOjkUKmn2B9Qa9/tNp82X8u1VsCeU/q 5kLBmZX4GNB5CMIe1b/PEGDTpIYyUJ5dOEetz7iveK/8nnrvTPrf1vMLOTl5Sa5rEfJioPwM2aYwB Hc7Otfw9pLiqYsaRra6cgW3YQP7rkbEiwdrmj/QwNDlS083QQyxbjOfpRccOT1Qe4UW2//GQcbgJZ ZU7NaCQ44sRRMPx9PrhsUF24hxAa16R9M12tGidceA/wBzbis8LcyF8/vLqnKeW2v6tG+uTxtBcJW 3MIybW9g==; Received: from [2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608] (helo=ulthar.dreamlands) by taras.nevrast.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rDlJN-0032wj-2X for netfilter-devel@vger.kernel.org; Thu, 14 Dec 2023 12:59:33 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH iptables 6/7] build: replace `echo -e` with `printf` Date: Thu, 14 Dec 2023 12:59:21 +0000 Message-ID: <20231214125927.925993-7-jeremy@azazel.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231214125927.925993-1-jeremy@azazel.net> References: <20231214125927.925993-1-jeremy@azazel.net> Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608 X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on taras.nevrast.org); SAEximRunCond expanded to false `echo -e` is not portable and we can end up with: GEN matches.man -e + ./libxt_addrtype.man -e + ./libip6t_ah.man -e + ./libipt_ah.man -e + ./libxt_bpf.man -e + ./libxt_cgroup.man -e + ./libxt_cluster.man -e + ./libxt_comment.man -e + ./libxt_connbytes.man -e + ./libxt_connlabel.man -e + ./libxt_connlimit.man -e + ./libxt_connmark.man -e + ./libxt_conntrack.man [...] Signed-off-by: Jeremy Sowden --- extensions/GNUmakefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index dfa58c3b9e8b..f41af7c1420d 100644 --- a/extensions/GNUmakefile.in +++ b/extensions/GNUmakefile.in @@ -228,19 +228,19 @@ man_run = \ for ext in $(sort ${1}); do \ f="${srcdir}/libxt_$$ext.man"; \ if [ -f "$$f" ]; then \ - echo -e "\t+ $$f" >&2; \ + printf "\t+ $$f" >&2; \ echo ".SS $$ext"; \ cat "$$f" || exit $$?; \ fi; \ f="${srcdir}/libip6t_$$ext.man"; \ if [ -f "$$f" ]; then \ - echo -e "\t+ $$f" >&2; \ + printf "\t+ $$f" >&2; \ echo ".SS $$ext (IPv6-specific)"; \ cat "$$f" || exit $$?; \ fi; \ f="${srcdir}/libipt_$$ext.man"; \ if [ -f "$$f" ]; then \ - echo -e "\t+ $$f" >&2; \ + printf "\t+ $$f" >&2; \ echo ".SS $$ext (IPv4-specific)"; \ cat "$$f" || exit $$?; \ fi; \ From patchwork Thu Dec 14 12:59:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1876183 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=azazel.net header.i=@azazel.net header.a=rsa-sha256 header.s=20220717 header.b=MB1bCOTi; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=147.75.199.223; helo=ny.mirrors.kernel.org; envelope-from=netfilter-devel+bounces-343-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org [147.75.199.223]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SrXWF3s80z23nn for ; Thu, 14 Dec 2023 23:59:53 +1100 (AEDT) Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 9CA551C21A18 for ; Thu, 14 Dec 2023 12:59:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 570304E61F; Thu, 14 Dec 2023 12:59:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=azazel.net header.i=@azazel.net header.b="MB1bCOTi" X-Original-To: netfilter-devel@vger.kernel.org Received: from azazel.net (unknown [IPv6:2a05:d01c:431:aa03:b7e1:333d:ea2a:b14e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48F25A6 for ; Thu, 14 Dec 2023 04:59:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20220717; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=fkGHOASEKfLYizqQMY5JAOTAzzIyc7UFjNgU/hMDnlI=; b=MB1bCOTidhaQuNI/LNaS+KXxZz y53yWl2dBlqj/ugl7oYrFIBG74HkZOIo2Fv+QqwG3yiD5kQ6p56pccaAePjuab13VjNo08c3VtbiZ jhvsJSLFGHOHuhiN4/Iulpo7LIB10Iom7c2AXki4s8BpvJhl43Nm5/8Deci69Aab9NmRE5ljGcxs1 LLgXqhQr3f+7sp9Lm7aVKBOx/CyMpOFNvQnfR6OMh3Lwl3kYY+tYflj6wColIIk5Do518tDtyJcNJ EZoXMcHqXSRm7EIx7VQIKaE+fR5mVd8jDX2ggvmjjPvNgryrCr3ZNtX2gHikWPybY0gCPBgJxMC/T Xd1gPo+w==; Received: from [2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608] (helo=ulthar.dreamlands) by taras.nevrast.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rDlJN-0032wj-2g for netfilter-devel@vger.kernel.org; Thu, 14 Dec 2023 12:59:33 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH iptables 7/7] build: suppress man-page listing in silent rules Date: Thu, 14 Dec 2023 12:59:22 +0000 Message-ID: <20231214125927.925993-8-jeremy@azazel.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231214125927.925993-1-jeremy@azazel.net> References: <20231214125927.925993-1-jeremy@azazel.net> Precedence: bulk X-Mailing-List: netfilter-devel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608 X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on taras.nevrast.org); SAEximRunCond expanded to false Add an `AM_V_PRINTF` variable to control whether `printf` is called. Normally `AM_V_*` variables work by prepending @echo blah; to a whole rule to replace the usual output with something briefer. Since, in this case, the aim is to suppress `printf` commands _within_ a rule, `AM_V_PRINTF` works be prepending `:` to the `printf` command. Signed-off-by: Jeremy Sowden --- extensions/GNUmakefile.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index f41af7c1420d..24ec57f7d1cb 100644 --- a/extensions/GNUmakefile.in +++ b/extensions/GNUmakefile.in @@ -40,16 +40,19 @@ am__v_CC_0 = @echo " CC " $@; am__v_CCLD_0 = @echo " CCLD " $@; am__v_GEN_0 = @echo " GEN " $@; am__v_LN_0 = @echo " LN " $@; +am__v_PRINTF_0 = : am__v_AR_ = ${am__v_AR_@AM_DEFAULT_V@} am__v_CC_ = ${am__v_CC_@AM_DEFAULT_V@} am__v_CCLD_ = ${am__v_CCLD_@AM_DEFAULT_V@} am__v_GEN_ = ${am__v_GEN_@AM_DEFAULT_V@} am__v_LN_ = ${am__v_LN_@AM_DEFAULT_V@} +am__v_PRINTF_ = ${am__v_PRINTF_@AM_DEFAULT_V@} AM_V_AR = ${am__v_AR_@AM_V@} AM_V_CC = ${am__v_CC_@AM_V@} AM_V_CCLD = ${am__v_CCLD_@AM_V@} AM_V_GEN = ${am__v_GEN_@AM_V@} AM_V_LN = ${am__v_LN_@AM_V@} +AM_V_PRINTF = ${am__v_PRINTF_@AM_V@} # # Wildcard module list @@ -221,6 +224,7 @@ ${initext_sources}: %.c: .%.dd # # Manual pages # + ex_matches = $(shell echo ${1} | LC_ALL=POSIX grep -Eo '\b[[:lower:][:digit:]_]+\b') ex_targets = $(shell echo ${1} | LC_ALL=POSIX grep -Eo '\b[[:upper:][:digit:]_]+\b') man_run = \ @@ -228,19 +232,19 @@ man_run = \ for ext in $(sort ${1}); do \ f="${srcdir}/libxt_$$ext.man"; \ if [ -f "$$f" ]; then \ - printf "\t+ $$f" >&2; \ + ${AM_V_PRINTF} printf "\t+ $$f" >&2; \ echo ".SS $$ext"; \ cat "$$f" || exit $$?; \ fi; \ f="${srcdir}/libip6t_$$ext.man"; \ if [ -f "$$f" ]; then \ - printf "\t+ $$f" >&2; \ + ${AM_V_PRINTF} printf "\t+ $$f" >&2; \ echo ".SS $$ext (IPv6-specific)"; \ cat "$$f" || exit $$?; \ fi; \ f="${srcdir}/libipt_$$ext.man"; \ if [ -f "$$f" ]; then \ - printf "\t+ $$f" >&2; \ + ${AM_V_PRINTF} printf "\t+ $$f" >&2; \ echo ".SS $$ext (IPv4-specific)"; \ cat "$$f" || exit $$?; \ fi; \