From patchwork Thu Dec 14 16:44:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1876271 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=EUfvKL4E; 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-361-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)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SrdVb3qmLz23nF for ; Fri, 15 Dec 2023 03:44:39 +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 D9CE828343F for ; Thu, 14 Dec 2023 16:44:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7A27760BAA; Thu, 14 Dec 2023 16:44:25 +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="EUfvKL4E" 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 C7B9F112 for ; Thu, 14 Dec 2023 08:44:18 -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=EUfvKL4ElY3WeG2pHCKwMCH1PT 3Fv/cEbzaEbKyOfFbnDBXLneGvyjlrbGyvz4UX62sg8PRFW2KEGbwcRAIvgokfnC2BrA3mS3VgCZ3 Lk4zzKgcf/KbpGM/FVJ0C7yjO6osw75JgkIL66BytPqjTngqea1r/sJK+RuLwQXqVu19tzxzSjnWJ L7usArKApyyD+RKR+YDn3Skl4Lw0w8DfVp02vlL1pshZLL/1SeFzOWITJ9JaXeXxtZVwXw/N0sBaG QpSWoajvzYiAh8f+egjL5Jt71Q12ZH3uLOnsMDHXMFjIKBnriprx/j9K+K9DWtk0NQ64KHHCkask+ cPS7LKuw==; 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 1rDoor-0038UN-1l for netfilter-devel@vger.kernel.org; Thu, 14 Dec 2023 16:44:17 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH iptables v2 1/6] build: format `AM_CPPFLAGS` variables Date: Thu, 14 Dec 2023 16:44:00 +0000 Message-ID: <20231214164408.1001721-2-jeremy@azazel.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231214164408.1001721-1-jeremy@azazel.net> References: <20231214164408.1001721-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 16:44:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1876274 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=VrZ+arIK; 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-363-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)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SrdVj5bk5z23nF for ; Fri, 15 Dec 2023 03:44:45 +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 5D4551F2212A for ; Thu, 14 Dec 2023 16:44:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 771F561FA8; Thu, 14 Dec 2023 16:44:26 +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="VrZ+arIK" 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 CABF5114 for ; Thu, 14 Dec 2023 08:44:18 -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=VrZ+arIKbYtobbYGLlKAyNlrx2 vC55Nj12e661JZ8YtbFckqiQvoThY31fjU/4IW8QFtbRbgUpYVI490MAbd6bVwTwr3MWIQl3PRZ7G b4jBEr43CzvVbcGMREexG7ynZBIIzqws31ImcRfOD0YAcOdp9OOtuI4HxWOWTgN+w6phIdFOGpXjd sxHC6EKUHqbvT2LiOKWlEmxTnXvJEeyNQcn2Lj6EBS92PkdJsZwE+aNiwW/vG58ZO+FI9AYstmnUb ar8f4jwWzw0KC32xlYxWSkC+YH/Xj4nLB2PZbNr63mG4wHqyoawVLIEpa9VbH+eXlbc72xDEtmhTK YVx+qU1g==; 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 1rDoor-0038UN-1u for netfilter-devel@vger.kernel.org; Thu, 14 Dec 2023 16:44:17 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH iptables v2 2/6] build: remove obsolete `AM_LIBTOOL_SILENT` variable Date: Thu, 14 Dec 2023 16:44:01 +0000 Message-ID: <20231214164408.1001721-3-jeremy@azazel.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231214164408.1001721-1-jeremy@azazel.net> References: <20231214164408.1001721-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 16:44:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1876269 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=Qzvx6+IJ; 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-358-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 4SrdVW0Qrrz23nF for ; Fri, 15 Dec 2023 03:44:35 +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 363031C20B36 for ; Thu, 14 Dec 2023 16:44:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C72EB60BB6; Thu, 14 Dec 2023 16:44:24 +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="Qzvx6+IJ" 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 D27B211A for ; Thu, 14 Dec 2023 08:44:18 -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=Qzvx6+IJ4zb7BePfyKHxFa0oH4 aQJJfTW+rS7rIaVCQv2vkGSyLZM9mfWkKj1wXHdUMDYzvQgo6hM1GhzyhopaT0552pps3lDQ920Hm WkCtl5nizBxOAKHmW12Vx4Ofgh3rxK1QUnQ99z1tXVBXIXPRv32OmH4pb/ZJRq7CAKC6f1mskRcgC 8Nm8SbDUy3WHecHkfjydR/QHfZCxVoYR2lbz4uqZIyA6hHBqcq/wFf0ATm9iHOaURDk1UhxjSDZUf Z/rz8GSF2JeU+Q0vf0PE2TBbN7eRMRXC2ekO0chyzsfi9oAjT5dPNMjD813rPQXyTXapjQOozBDuU 4Tu+0fbw==; 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 1rDoor-0038UN-23 for netfilter-devel@vger.kernel.org; Thu, 14 Dec 2023 16:44:17 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH iptables v2 3/6] build: remove unused `AM_VERBOSE_CXX*` variables Date: Thu, 14 Dec 2023 16:44:02 +0000 Message-ID: <20231214164408.1001721-4-jeremy@azazel.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231214164408.1001721-1-jeremy@azazel.net> References: <20231214164408.1001721-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 16:44:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1876270 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=BUB/SSUf; 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-359-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 4SrdVY3Sjlz23nF for ; Fri, 15 Dec 2023 03:44:37 +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 94CCC1F220CF for ; Thu, 14 Dec 2023 16:44:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DC68760BB9; Thu, 14 Dec 2023 16:44:24 +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="BUB/SSUf" 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 DFFA011B for ; Thu, 14 Dec 2023 08:44:18 -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=BUB/SSUfJz7CT+zyvdZoSQI2Do pXitLwG6PBKCe942GmzdlUykrPcQ0Lu/I5+ocrYMh3GgOMd5FjW2N6Ed5TJHMXB+ks/za0u9e27zq 6Av2e5P1akqxDzfDo+DbsohKJl88BWinPVPZbr/x+7xwuJ90yarLdAPlzfdMEVKmeprY04N/bzkvB XdnoYSCey+Qm4bi7sXaZKj/pJ7D3q6g4g/fJ92jmb7XLwnZOuUGnMFiaZ59OsRqrYccwv1HvZ58im 2I+CpTqy4Gr7RZ5sykVkZij9vDMSnpp1QsGo6BRRJzxWGEpLWdHdgoVqLpnQKy3JU8yeawTjXJLSS dJc1kdTg==; 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 1rDoor-0038UN-2C for netfilter-devel@vger.kernel.org; Thu, 14 Dec 2023 16:44:17 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH iptables v2 4/6] build: use standard automake verbosity variables Date: Thu, 14 Dec 2023 16:44:03 +0000 Message-ID: <20231214164408.1001721-5-jeremy@azazel.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231214164408.1001721-1-jeremy@azazel.net> References: <20231214164408.1001721-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 16:44:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1876273 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=IiaCjNyj; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=139.178.88.99; helo=sv.mirrors.kernel.org; envelope-from=netfilter-devel+bounces-362-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org [139.178.88.99]) (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 4SrdVg05lDz23nF for ; Fri, 15 Dec 2023 03:44:43 +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 BAAF82834E7 for ; Thu, 14 Dec 2023 16:44:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6D41661696; Thu, 14 Dec 2023 16:44:26 +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="IiaCjNyj" 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 0800311D for ; Thu, 14 Dec 2023 08:44:18 -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=IiaCjNyjAWvA8hgR/nznNMfXEE JWqg0TNmi3fgN62Uq1AwHhCR3mdzO0P1eXI4DBvLbsX8wIQGmfSpliiB1+Moa+7PVl5GtmZYnwxXC NF+EyjyPMzL4unmQaMQ5vdpaGCJaJNxYIrZectaG6s9eMIkh6QfENo/q8GFAELvvZByJMQvOzmZ3x TgAgWZFu5zCaAa0ccpJKruVUH8f514qqLOIVFR1PGDegioyBa2ZxIGVTHzB7PIhTqs2KEQx54CTNd KPYDOPkDtB47HQg3qQOk6mLlT7WXqW7oGwy76TRow31U4HPdv8kWUqY0Rfy9JLdoHuXQEBb15TQ/g 8lTwfK4A==; 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 1rDoor-0038UN-2L for netfilter-devel@vger.kernel.org; Thu, 14 Dec 2023 16:44:17 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH iptables v2 5/6] build: add an automake verbosity variable for `ln` Date: Thu, 14 Dec 2023 16:44:04 +0000 Message-ID: <20231214164408.1001721-6-jeremy@azazel.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231214164408.1001721-1-jeremy@azazel.net> References: <20231214164408.1001721-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 16:44:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1876272 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=ZhFe1Hci; 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-360-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)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SrdVc2qlvz23nn for ; Fri, 15 Dec 2023 03:44:40 +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 13BF31F220D9 for ; Thu, 14 Dec 2023 16:44:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5167160BBE; Thu, 14 Dec 2023 16:44:25 +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="ZhFe1Hci" 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 0FD03120 for ; Thu, 14 Dec 2023 08:44:19 -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=PW+L8Bt1onKMhcUk/GBl5hwPZR555HSH4eZvlLezlbw=; b=ZhFe1Hci/xqu4dddOrQ8OqNwvY CZqZxxYJUpllLArDzF5Lrww4shniVy7EHSLN3FHvizvK2uUqcHedA4FzH3VPlX1jCs4hq79eogz0Q 1o9KWpLKvzaYfAQXh2DaS4jA1KQVZ60L+gLk/te7XL8LmRZ3A40711PRuZPavoetkb3AhylWq653n EdY/xkhf4pw7KRLHo1FJwOH8orAV59Tohaht3FFwLWNUoKCk8AigTeFgObXALcKHcZ3ncAD731yXv cWwcCxROI/rfKdAftBTxTyDNBnQslFam6aXGcSqbfHVp561TEyDaVEz8hnCkL78P7dnM15m+H3nrH 9KotUqhQ==; 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 1rDoor-0038UN-2U for netfilter-devel@vger.kernel.org; Thu, 14 Dec 2023 16:44:17 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH iptables v2 6/6] build: replace `echo -e` with `printf` Date: Thu, 14 Dec 2023 16:44:05 +0000 Message-ID: <20231214164408.1001721-7-jeremy@azazel.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231214164408.1001721-1-jeremy@azazel.net> References: <20231214164408.1001721-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..20c2b7bc6293 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\n" >&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\n" >&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\n" >&2; \ echo ".SS $$ext (IPv4-specific)"; \ cat "$$f" || exit $$?; \ fi; \