From: Thomas Haller <thaller@redhat.com>
To: NetFilter <netfilter-devel@vger.kernel.org>
Cc: Thomas Haller <thaller@redhat.com>
Subject: [PATCH nft 2/6] build: drop recursive make for "py/Makefile.am"
Date: Fri, 25 Aug 2023 13:27:34 +0200 [thread overview]
Message-ID: <20230825113042.2607496-3-thaller@redhat.com> (raw)
In-Reply-To: <20230825113042.2607496-1-thaller@redhat.com>
Signed-off-by: Thomas Haller <thaller@redhat.com>
---
Makefile.am | 19 +++++++++++++++----
configure.ac | 1 -
py/Makefile.am | 1 -
3 files changed, 15 insertions(+), 6 deletions(-)
delete mode 100644 py/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 2be6329275e0..feb21454b5eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
ACLOCAL_AMFLAGS = -I m4
+EXTRA_DIST =
+
pkginclude_HEADERS = \
include/nftables/libnftables.h \
$(NULL)
@@ -72,11 +74,20 @@ noinst_HEADERS = \
SUBDIRS = src \
files \
doc \
- examples\
- py
+ examples
+
+EXTRA_DIST += \
+ py/pyproject.toml \
+ py/setup.cfg \
+ py/setup.py \
+ py/src/__init__.py \
+ py/src/nftables.py \
+ py/src/schema.json \
+ $(NULL)
-EXTRA_DIST = tests \
- files
+EXTRA_DIST += \
+ tests \
+ files
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libnftables.pc
diff --git a/configure.ac b/configure.ac
index ca2eaca09869..06ac7da27ae3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,7 +121,6 @@ AC_CONFIG_FILES([ \
files/nftables/Makefile \
files/osf/Makefile \
doc/Makefile \
- py/Makefile \
examples/Makefile \
])
AC_OUTPUT
diff --git a/py/Makefile.am b/py/Makefile.am
deleted file mode 100644
index 76aa082f8709..000000000000
--- a/py/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = pyproject.toml setup.cfg setup.py src
--
2.41.0
next prev parent reply other threads:[~2023-08-25 11:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-25 11:27 [PATCH nft 0/6] no recursive make Thomas Haller
2023-08-25 11:27 ` [PATCH nft 1/6] build: drop recursive make for "include/**/Makefile.am" Thomas Haller
2023-08-25 11:27 ` Thomas Haller [this message]
2023-08-25 11:27 ` [PATCH nft 3/6] build: drop recursive make for "files/**/Makefile.am" Thomas Haller
2023-08-25 11:27 ` [PATCH nft 4/6] build: drop recursive make for "src/Makefile.am" Thomas Haller
2023-08-25 11:27 ` [PATCH nft 5/6] build: drop recursive make for "examples/Makefile.am" Thomas Haller
2023-09-08 11:09 ` Phil Sutter
2023-09-08 11:50 ` Thomas Haller
2023-08-25 11:27 ` [PATCH nft 6/6] build: drop recursive make for "doc/Makefile.am" Thomas Haller
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=20230825113042.2607496-3-thaller@redhat.com \
--to=thaller@redhat.com \
--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).