From: Thomas Haller <thaller@redhat.com>
To: NetFilter <netfilter-devel@vger.kernel.org>
Cc: Thomas Haller <thaller@redhat.com>
Subject: [PATCH nft 5/6] build: drop recursive make for "examples/Makefile.am"
Date: Fri, 25 Aug 2023 13:27:37 +0200 [thread overview]
Message-ID: <20230825113042.2607496-6-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 -
examples/Makefile.am | 6 ------
3 files changed, 16 insertions(+), 10 deletions(-)
delete mode 100644 examples/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 2ad18f72dfd6..4af2d1f88b46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,9 +26,11 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST =
BUILT_SOURCES =
+LDADD =
lib_LTLIBRARIES =
noinst_LTLIBRARIES =
sbin_PROGRAMS =
+check_PROGRAMS =
###############################################################################
@@ -282,9 +284,20 @@ src_nft_LDADD = src/libnftables.la
###############################################################################
-SUBDIRS = \
- doc \
- examples
+SUBDIRS = doc
+
+###############################################################################
+
+
+check_PROGRAMS += examples/nft-buffer
+
+examples_nft_buffer_AM_CPPFLAGS = -I$(srcdir)/include
+examples_nft_buffer_LDADD = src/libnftables.la
+
+check_PROGRAMS += examples/nft-json-file
+
+examples_nft_json_file_AM_CPPFLAGS = -I$(srcdir)/include
+examples_nft_json_file_LDADD = src/libnftables.la
###############################################################################
diff --git a/configure.ac b/configure.ac
index 739434b7f474..b5cc2587253b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,7 +116,6 @@ AC_CONFIG_FILES([ \
Makefile \
libnftables.pc \
doc/Makefile \
- examples/Makefile \
])
AC_OUTPUT
diff --git a/examples/Makefile.am b/examples/Makefile.am
deleted file mode 100644
index 3b8b0b6708dc..000000000000
--- a/examples/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-check_PROGRAMS = nft-buffer \
- nft-json-file
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-
-LDADD = $(top_builddir)/src/libnftables.la
--
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 ` [PATCH nft 2/6] build: drop recursive make for "py/Makefile.am" Thomas Haller
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 ` Thomas Haller [this message]
2023-09-08 11:09 ` [PATCH nft 5/6] build: drop recursive make for "examples/Makefile.am" 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-6-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).