From patchwork Wed Aug 3 20:12:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1663489 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=20190108 header.b=B7j45gBS; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4Lyjjp6PtRz9sFs for ; Thu, 4 Aug 2022 06:13:50 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237264AbiHCUNp (ORCPT ); Wed, 3 Aug 2022 16:13:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233695AbiHCUNo (ORCPT ); Wed, 3 Aug 2022 16:13:44 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5AF684A811 for ; Wed, 3 Aug 2022 13:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: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=Y962I2VJlzPrVPmLuORkzm6ZYil9gCw9ZbXs5TAHYmU=; b=B7j45gBSubh3vNdhk6DAV4mDCT KfjUjuagdUR+7mfirJ5dcIpAkuzecDLU4Bvldk3sYDBqu1y+JpzjWhnZ6xulB6pvbmBG/II/wkeyD skSNXpWaLt/mltHgTk7mZy7xD4FivHwkbJkhhejSvrDcXkTEGUPeiwHV/UFzYBGp561CjoGEkULEI Ggng4l+syklFPZ7nr2o2y7/5Wkxs60FuDYY1J9IS6tdgOsEKeG5tj3kewEKQCHW+E9lyX4RySD6/Y ooQ8IpjhjUe8Ov5GGy8KFZi6d2ncLj8tTaGatMHKTlE03Z2fwvhh3RDbnXmhHAOmLsXyXU6iG/RdA zqqXJniw==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1oJKkJ-001Fnp-QI; Wed, 03 Aug 2022 21:13:35 +0100 From: Jeremy Sowden To: Netfilter Devel Cc: Mark Mentovai , Duncan Roe Subject: [PATCH libmnl 1/6] build: add `make dist` tar-balls to .gitignore Date: Wed, 3 Aug 2022 21:12:42 +0100 Message-Id: <20220803201247.3057365-2-jeremy@azazel.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220803201247.3057365-1-jeremy@azazel.net> References: <20220803201247.3057365-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RDNS_NONE,SPF_HELO_PASS, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by: Jeremy Sowden --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 9a7d86c78ae2..0276c98fb3a5 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ Makefile.in /doxygen.cfg /libmnl.pc + +/libmnl-*.tar.bz2 From patchwork Wed Aug 3 20:12:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1663490 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=20190108 header.b=C9tLkGkw; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4Lyjjs4cstz9sGR for ; Thu, 4 Aug 2022 06:13:53 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233695AbiHCUNp (ORCPT ); Wed, 3 Aug 2022 16:13:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236087AbiHCUNo (ORCPT ); Wed, 3 Aug 2022 16:13:44 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C4A053D25 for ; Wed, 3 Aug 2022 13:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: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=S/E5GT3B1mSZZ39pxo+XjVOJcdhPJ3ojsb+N3zrDGNM=; b=C9tLkGkwl08nBppmwEl/PnhxLQ yVDI53FJOv3+xBWTIM/cyoUWcJ54K9fdZA32ECUoGRe1Khs92zQ872UQ/r6v4PqcmZbGOUlmmaY+O +tiDqWZ5Gz8uB3Lezrulw1wo18WgyiUm9EOAyrobeoY7DGc8dv4ukinEVT3YtyWCWc5z95m3a2MxK dBySAUamhf90dN1NzdobWbnDcS/0YkixoO5aeaH4Z/bm2NV9oiwYLW/w76QpyQZ8Flz0V36e6LTgk mTMDmq77VM0PwcVptXmqVyTEyEjh8we6yVSjWSsM+Ic/c1IPwyjE9MArtjfbb08gxiBPhbsbBwWcE WhpiMLNQ==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1oJKkJ-001Fnp-Sj; Wed, 03 Aug 2022 21:13:35 +0100 From: Jeremy Sowden To: Netfilter Devel Cc: Mark Mentovai , Duncan Roe Subject: [PATCH libmnl 2/6] doc: add .gitignore for Doxygen artefacts Date: Wed, 3 Aug 2022 21:12:43 +0100 Message-Id: <20220803201247.3057365-3-jeremy@azazel.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220803201247.3057365-1-jeremy@azazel.net> References: <20220803201247.3057365-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RDNS_NONE,SPF_HELO_PASS, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by: Jeremy Sowden --- doxygen/.gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doxygen/.gitignore diff --git a/doxygen/.gitignore b/doxygen/.gitignore new file mode 100644 index 000000000000..a23345c2c599 --- /dev/null +++ b/doxygen/.gitignore @@ -0,0 +1,3 @@ +doxyfile.stamp +html/ +man/ From patchwork Wed Aug 3 20:12:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1663493 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=20190108 header.b=D3000VGL; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4Lyjjt4QWcz9sFs for ; Thu, 4 Aug 2022 06:13:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237134AbiHCUNr (ORCPT ); Wed, 3 Aug 2022 16:13:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237795AbiHCUNq (ORCPT ); Wed, 3 Aug 2022 16:13:46 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5BD9B5018E for ; Wed, 3 Aug 2022 13:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: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=IMHgb2aap6gTQPn74bhjzZ4pxwf2sSjuTc8/Mp4ul1U=; b=D3000VGL3X2qS0Kvx8CqymwrOt 2wTneSdG2n8WGYpXNvUiC39V+QVJR2NOPYQ/g5dRgP7nZMGQ/fPqdZriSiL2+Fse/XaiWJ2spOnbL ulSVLjFYkYD9KkxFxyb8FKfT8y+VdsCAGZCxHVNVikSR8s6tMIdcWQtN28CEhvoJe4ULqMqtsIQAd S9oWe+ER8VBPVP1mrjYxYxGSZIEZ21UE61elsPyZsW8dz1r3jfWBNOIhKWVZgoJUE/xkerKbcqT7z yyJTW6o7EzOxGqsDbjQYemeO30o4JmXmaBUtBeAWPteyvo//L0LYcKL3QRLr64iLtP4tI2c2qon3D qpodmUIg==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1oJKkK-001Fnp-1T; Wed, 03 Aug 2022 21:13:36 +0100 From: Jeremy Sowden To: Netfilter Devel Cc: Mark Mentovai , Duncan Roe Subject: [PATCH libmnl 3/6] doc: change `INPUT` doxygen setting to `@top_srcdir@` Date: Wed, 3 Aug 2022 21:12:44 +0100 Message-Id: <20220803201247.3057365-4-jeremy@azazel.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220803201247.3057365-1-jeremy@azazel.net> References: <20220803201247.3057365-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RDNS_NONE,SPF_HELO_PASS, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org It avoids the need to move src directories in doxygen/Makefile. Signed-off-by: Jeremy Sowden --- doxygen.cfg.in | 2 +- doxygen/Makefile.am | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/doxygen.cfg.in b/doxygen.cfg.in index ae31dbe4c16c..d6db0048a1f7 100644 --- a/doxygen.cfg.in +++ b/doxygen.cfg.in @@ -6,7 +6,7 @@ ABBREVIATE_BRIEF = FULL_PATH_NAMES = NO TAB_SIZE = 8 OPTIMIZE_OUTPUT_FOR_C = YES -INPUT = . +INPUT = @top_srcdir@ FILE_PATTERNS = */src/*.c RECURSIVE = YES EXCLUDE_SYMBOLS = EXPORT_SYMBOL mnl_nlmsg_batch mnl_socket diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am index 29078dee122a..bca5092b4aec 100644 --- a/doxygen/Makefile.am +++ b/doxygen/Makefile.am @@ -4,18 +4,7 @@ doc_srcs = $(shell find $(top_srcdir)/src -name '*.c') doxyfile.stamp: $(doc_srcs) Makefile.am rm -rf html man - -# Test for running under make distcheck. -# If so, sibling src directory will be empty: -# move it out of the way and symlink the real one while we run doxygen. - [ -f ../src/Makefile.in ] || \ -{ set -x; cd ..; mv src src.distcheck; ln -s $(top_srcdir)/src; } - cd ..; doxygen doxygen.cfg >/dev/null - - [ ! -d ../src.distcheck ] || \ -{ set -x; cd ..; rm src; mv src.distcheck src; } - # We need to use bash for its associative array facility # (`bash -p` prevents import of functions from the environment). # The command has to be a single line so the functions work From patchwork Wed Aug 3 20:12:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1663495 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=20190108 header.b=WvYYBzJW; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4Lyjjv2HX9z9sGV for ; Thu, 4 Aug 2022 06:13:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237795AbiHCUNv (ORCPT ); Wed, 3 Aug 2022 16:13:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237819AbiHCUNt (ORCPT ); Wed, 3 Aug 2022 16:13:49 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C5555466C for ; Wed, 3 Aug 2022 13:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: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=6Nx+hzOaIiEelZVmqeVMQbT2AMLpYhtV+hxKsZG+v0k=; b=WvYYBzJWxKGo3L99DCGsRtSxtO VujGHrNHO6DSAZnICgeV+iQeNOzS2KUBAkvxek547A2MlrMaTQDxxfSm3wvABy1euKqWzw8wL+bW8 HShqmOQBUP5FEvVttTcN+U2PM49o1g/zI7QkTD0+FR9e/66niDBItywsBvMVVGh5LGgWmJCNE+8ay 7JGQVlZuga40ZiREmUmtiQQIl6eaC531K/1jHHYLytGxn51SKfBmDjPKO6I4crptl71RGeozeAbUH hoTvTdGzBI46ml/UfNaLdVt00gsBftDHPERT8mGJ70aBwYMYJei1AuZ8a0ED2NRzBiCbfOwwsntX7 7VXkx+bw==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1oJKkK-001Fnp-4Q; Wed, 03 Aug 2022 21:13:36 +0100 From: Jeremy Sowden To: Netfilter Devel Cc: Mark Mentovai , Duncan Roe Subject: [PATCH libmnl 4/6] doc: move doxygen config file into doxygen directory Date: Wed, 3 Aug 2022 21:12:45 +0100 Message-Id: <20220803201247.3057365-5-jeremy@azazel.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220803201247.3057365-1-jeremy@azazel.net> References: <20220803201247.3057365-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RDNS_NONE,SPF_HELO_PASS, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Now that the `INPUT` directory is correct, we can update `OUTPUT_DIRECTORY` to `.` and we don't need to cd out of the doxygen directory to run doxygen. Signed-off-by: Jeremy Sowden --- .gitignore | 1 - configure.ac | 15 ++++++++++++++- doxygen/.gitignore | 1 + doxygen/Makefile.am | 2 +- doxygen.cfg.in => doxygen/doxygen.cfg.in | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) rename doxygen.cfg.in => doxygen/doxygen.cfg.in (95%) diff --git a/.gitignore b/.gitignore index 0276c98fb3a5..b6b8d60db5dc 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,6 @@ Makefile.in /libtool /stamp-h1 -/doxygen.cfg /libmnl.pc /libmnl-*.tar.bz2 diff --git a/configure.ac b/configure.ac index 314481dae87e..dcdd4245175e 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,20 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ -Wformat=2 -pipe" AC_SUBST([regular_CPPFLAGS]) AC_SUBST([regular_CFLAGS]) -AC_CONFIG_FILES([Makefile src/Makefile include/Makefile include/libmnl/Makefile include/linux/Makefile include/linux/netfilter/Makefile examples/Makefile examples/genl/Makefile examples/kobject/Makefile examples/netfilter/Makefile examples/rtnl/Makefile libmnl.pc doxygen.cfg doxygen/Makefile]) +AC_CONFIG_FILES([Makefile + src/Makefile + include/Makefile + include/libmnl/Makefile + include/linux/Makefile + include/linux/netfilter/Makefile + examples/Makefile + examples/genl/Makefile + examples/kobject/Makefile + examples/netfilter/Makefile + examples/rtnl/Makefile + libmnl.pc + doxygen/doxygen.cfg + doxygen/Makefile]) AC_ARG_WITH([doxygen], [AS_HELP_STRING([--with-doxygen], [create doxygen documentation])], diff --git a/doxygen/.gitignore b/doxygen/.gitignore index a23345c2c599..2196cf8c442b 100644 --- a/doxygen/.gitignore +++ b/doxygen/.gitignore @@ -1,3 +1,4 @@ doxyfile.stamp +doxygen.cfg html/ man/ diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am index bca5092b4aec..3f0b1e9a8ab4 100644 --- a/doxygen/Makefile.am +++ b/doxygen/Makefile.am @@ -4,7 +4,7 @@ doc_srcs = $(shell find $(top_srcdir)/src -name '*.c') doxyfile.stamp: $(doc_srcs) Makefile.am rm -rf html man - cd ..; doxygen doxygen.cfg >/dev/null + doxygen doxygen.cfg >/dev/null # We need to use bash for its associative array facility # (`bash -p` prevents import of functions from the environment). # The command has to be a single line so the functions work diff --git a/doxygen.cfg.in b/doxygen/doxygen.cfg.in similarity index 95% rename from doxygen.cfg.in rename to doxygen/doxygen.cfg.in index d6db0048a1f7..24089ac0cb95 100644 --- a/doxygen.cfg.in +++ b/doxygen/doxygen.cfg.in @@ -1,7 +1,7 @@ # Difference with default Doxyfile 1.8.20 PROJECT_NAME = @PACKAGE@ PROJECT_NUMBER = @VERSION@ -OUTPUT_DIRECTORY = doxygen +OUTPUT_DIRECTORY = . ABBREVIATE_BRIEF = FULL_PATH_NAMES = NO TAB_SIZE = 8 From patchwork Wed Aug 3 20:12:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1663491 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=20190108 header.b=i2sDYpy2; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4Lyjjs6WRdz9sGV for ; Thu, 4 Aug 2022 06:13:53 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236087AbiHCUNq (ORCPT ); Wed, 3 Aug 2022 16:13:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236153AbiHCUNo (ORCPT ); Wed, 3 Aug 2022 16:13:44 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E94D13AB32 for ; Wed, 3 Aug 2022 13:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: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=einHuz0BP9d6TAxMxn7a5YDebBBS8bB6i8o15dndFu8=; b=i2sDYpy25SG8Z2VmHDQtyTflSu eVaZ9MnebaONn6rkIG4LVtV6nmVUY1qt3PIT7OSfTVnWUyKb2B8xo66iVmisozE5ToyIdAk4xKyWD IU4k7w5KIoHGiCvez9I6H7pHJcJr8JrrJYHbMfnfh0TDIzexkzJKvT3spSvGemKR17ZKmq5IjU4ta cHuPQ1WmLJPSA3xLQNvDmlc3TshQIOW5UsCV7kVrY9SsBa94uYR2+Wa58LsxA8jjPHHXYBCAP65Dz w2Z/tiaOI18z8SZWCsH9Ibm3w1XygpZol4tD6Ij3I+QA10u5Lj103XplloNv1fCQpTheOkkYs2hwB HKras0NA==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1oJKkK-001Fnp-7h; Wed, 03 Aug 2022 21:13:36 +0100 From: Jeremy Sowden To: Netfilter Devel Cc: Mark Mentovai , Duncan Roe Subject: [PATCH libmnl 5/6] doc: move man-page sym-link shell-script into a separate file Date: Wed, 3 Aug 2022 21:12:46 +0100 Message-Id: <20220803201247.3057365-6-jeremy@azazel.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220803201247.3057365-1-jeremy@azazel.net> References: <20220803201247.3057365-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RDNS_NONE,SPF_HELO_PASS, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org We use `$(SHELL)` to run the script and exec bash if `$(SHELL)` is something else. We don't hard-code the path to bash. Signed-off-by: Jeremy Sowden --- doxygen/Makefile.am | 36 +++----------------------------- doxygen/finalize_manpages.sh | 40 ++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 33 deletions(-) create mode 100644 doxygen/finalize_manpages.sh diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am index 3f0b1e9a8ab4..4770fc788068 100644 --- a/doxygen/Makefile.am +++ b/doxygen/Makefile.am @@ -1,42 +1,10 @@ if HAVE_DOXYGEN - doc_srcs = $(shell find $(top_srcdir)/src -name '*.c') doxyfile.stamp: $(doc_srcs) Makefile.am rm -rf html man doxygen doxygen.cfg >/dev/null -# We need to use bash for its associative array facility -# (`bash -p` prevents import of functions from the environment). -# The command has to be a single line so the functions work -# and so `make` gives all lines to `bash -c` -# (hence ";\" at the end of every line but the last). - /bin/bash -p -c 'declare -A renamed_page;\ -main(){ set -e; cd man/man3; rm -f _*;\ - count_real_pages;\ - rename_real_pages;\ - make_symlinks;\ -};\ -count_real_pages(){ page_count=0;\ - for i in $$(ls -S);\ - do head -n1 $$i | grep -E -q '^\.so' && break;\ - page_count=$$(($$page_count + 1));\ - done;\ - first_link=$$(($$page_count + 1));\ -};\ -rename_real_pages(){ for i in $$(ls -S | head -n$$page_count);\ - do for j in $$(ls -S | tail -n+$$first_link);\ - do grep -E -q $$i$$ $$j && break;\ - done;\ - mv -f $$i $$j;\ - renamed_page[$$i]=$$j;\ - done;\ -};\ -make_symlinks(){ for j in $$(ls -S | tail -n+$$first_link);\ - do ln -sf $${renamed_page[$$(cat $$j | cut -f2 -d/)]} $$j;\ - done;\ -};\ -main' - + $(SHELL) $(top_srcdir)/doxygen/finalize_manpages.sh touch doxyfile.stamp CLEANFILES = doxyfile.stamp @@ -53,3 +21,5 @@ install-data-local: uninstall-local: rm -r $(DESTDIR)$(mandir) man html doxyfile.stamp endif + +EXTRA_DIST = finalize_manpages.sh diff --git a/doxygen/finalize_manpages.sh b/doxygen/finalize_manpages.sh new file mode 100644 index 000000000000..6f230b12cbc0 --- /dev/null +++ b/doxygen/finalize_manpages.sh @@ -0,0 +1,40 @@ +# +# We need to use bash for its associative array facility +# +[ "$BASH" ] || exec bash $0 +# +# (`bash -p` prevents import of functions from the environment). +# +set -p + +declare -A renamed_page + +main(){ set -e; cd man/man3; rm -f _* + count_real_pages + rename_real_pages + make_symlinks +} + +count_real_pages(){ page_count=0 + for i in $(ls -S) + do head -n1 $i | grep -E -q '^\.so' && break + page_count=$(($page_count + 1)) + done + first_link=$(($page_count + 1)) +} + +rename_real_pages(){ for i in $(ls -S | head -n$page_count) + do for j in $(ls -S | tail -n+$first_link) + do grep -E -q $i$ $j && break + done + mv -f $i $j + renamed_page[$i]=$j + done +} + +make_symlinks(){ for j in $(ls -S | tail -n+$first_link) + do ln -sf ${renamed_page[$(cat $j | cut -f2 -d/)]} $j + done +} + +main From patchwork Wed Aug 3 20:12:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Sowden X-Patchwork-Id: 1663492 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.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=20190108 header.b=NM4Lu8c7; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by bilbo.ozlabs.org (Postfix) with ESMTP id 4Lyjjt256pz9sGZ for ; Thu, 4 Aug 2022 06:13:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236153AbiHCUNq (ORCPT ); Wed, 3 Aug 2022 16:13:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237134AbiHCUNp (ORCPT ); Wed, 3 Aug 2022 16:13:45 -0400 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B0EB4F65E for ; Wed, 3 Aug 2022 13:13:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20190108; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: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=8K3oK2cEo5YPDIFhg3Rpn97CQOtb/soy2fATPTQreJA=; b=NM4Lu8c7LRh2fD3NprLm12+0ua i6Kgs6TyHkydOkdcXbA8mooRqdNPfxxff8WaInOZI/drDjTHOQDh6+RFyAd6vmeaQEGngvrPr22kX U3UFK5CTFdxvK+vLm2hOsMO6l61W+hBIPlvcANnIdv1AmsoaSElh99mfM4yoHoGMKg+Dh9SercnQR 46weZz14U2vTAPuH8eCmwuFitADjiDoQGbJTD300qW3jlOrjsu0FgjEzMb7Hr8mkxO2+djsdisda+ ZuL7f2tyhlv38QUjV2NKqIk2CG0SOOEVt+iX84hkvAJpyHLddJ6jHEI2A5nTbcO5I5H/udI1ILGyd A/u5a8qQ==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1oJKkK-001Fnp-Bz; Wed, 03 Aug 2022 21:13:36 +0100 From: Jeremy Sowden To: Netfilter Devel Cc: Mark Mentovai , Duncan Roe Subject: [PATCH libmnl 6/6] doc: fix doxygen `clean-local` rule Date: Wed, 3 Aug 2022 21:12:47 +0100 Message-Id: <20220803201247.3057365-7-jeremy@azazel.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220803201247.3057365-1-jeremy@azazel.net> References: <20220803201247.3057365-1-jeremy@azazel.net> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RDNS_NONE,SPF_HELO_PASS, SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org The html and man directories are created in the current working directory, $(top_builddir)/doxygen, not $(top_srcdir)/doxygen. Remove doxyfile.stamp in `clean-local` and remove `CLEANFILES` in order to do all cleaning in one place. Signed-off-by: Jeremy Sowden --- doxygen/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am index 4770fc788068..90154c2eb869 100644 --- a/doxygen/Makefile.am +++ b/doxygen/Makefile.am @@ -7,11 +7,9 @@ doxyfile.stamp: $(doc_srcs) Makefile.am $(SHELL) $(top_srcdir)/doxygen/finalize_manpages.sh touch doxyfile.stamp -CLEANFILES = doxyfile.stamp - all-local: doxyfile.stamp clean-local: - rm -rf $(top_srcdir)/doxygen/man $(top_srcdir)/doxygen/html + rm -rf doxyfile.stamp html man install-data-local: mkdir -p $(DESTDIR)$(mandir)/man3 cp --no-dereference --preserve=links,mode,timestamps man/man3/*.3\