netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phil Sutter <phil@nwl.cc>
To: netfilter-devel@vger.kernel.org
Subject: [iptables PATCH 09/11] include/Makefile: xtables-version.h is generated
Date: Wed,  7 Dec 2022 18:44:28 +0100	[thread overview]
Message-ID: <20221207174430.4335-10-phil@nwl.cc> (raw)
In-Reply-To: <20221207174430.4335-1-phil@nwl.cc>

List it in nodist_include_HEADERS so it is installed but not
distributed - configure generates it from xtables-version.h.in.

While being at it, list xtables.h in plain include_HEADERS. It doesn't
sit in a sub-dir, so the nobase prefix does not make a difference.

Fixes: df60a301bf24c ("build: separate AC variable replacements from xtables.h")
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 include/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/Makefile.am b/include/Makefile.am
index 348488a45ce84..07c88b901e808 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,13 +1,13 @@
 # -*- Makefile -*-
 
-include_HEADERS =
-nobase_include_HEADERS = xtables.h xtables-version.h
+include_HEADERS = xtables.h
+nodist_include_HEADERS = xtables-version.h
 
 if ENABLE_LIBIPQ
 include_HEADERS += libipq/libipq.h
 endif
 
-nobase_include_HEADERS += \
+nobase_include_HEADERS = \
 	libiptc/ipt_kernel_headers.h libiptc/libiptc.h \
 	libiptc/libip6tc.h libiptc/libxtc.h libiptc/xtcshared.h
 
-- 
2.38.0


  parent reply	other threads:[~2022-12-07 17:45 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-07 17:44 [iptables PATCH 00/11] Support 'make dist' and 'make check' Phil Sutter
2022-12-07 17:44 ` [iptables PATCH 01/11] Drop INCOMPATIBILITIES file Phil Sutter
2022-12-07 17:44 ` [iptables PATCH 02/11] Drop libiptc/linux_stddef.h Phil Sutter
2022-12-07 17:44 ` [iptables PATCH 03/11] Makefile: Generate ip6tables man pages on the fly Phil Sutter
2022-12-07 18:36   ` Jan Engelhardt
2022-12-07 18:48     ` Phil Sutter
2022-12-07 17:44 ` [iptables PATCH 04/11] extensions: Makefile: Merge initext targets Phil Sutter
2022-12-07 17:44 ` [iptables PATCH 05/11] iptables/Makefile: Reorg variable assignments Phil Sutter
2022-12-07 17:44 ` [iptables PATCH 06/11] iptables/Makefile: Split nft-variant man page list Phil Sutter
2022-12-07 17:44 ` [iptables PATCH 07/11] Makefile: Fix for 'make distcheck' Phil Sutter
2022-12-07 17:44 ` [iptables PATCH 08/11] Makefile: Generate .tar.bz2 archive with 'make dist' Phil Sutter
2022-12-07 18:45   ` Jan Engelhardt
2022-12-07 18:56     ` Phil Sutter
2022-12-07 19:13       ` Jan Engelhardt
2022-12-07 20:55         ` Phil Sutter
2022-12-07 21:35           ` Pablo Neira Ayuso
2022-12-07 17:44 ` Phil Sutter [this message]
2022-12-07 17:44 ` [iptables PATCH 10/11] tests: Adjust testsuite return codes to automake guidelines Phil Sutter
2022-12-07 17:44 ` [iptables PATCH 11/11] Makefile.am: Integrate testsuites Phil Sutter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221207174430.4335-10-phil@nwl.cc \
    --to=phil@nwl.cc \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).