From: Jan Engelhardt <jengelh@medozas.de>
To: kadlec@blackhole.kfki.hu
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 3/6] build: process include/libipset/
Date: Sat, 17 Dec 2011 16:35:05 +0100 [thread overview]
Message-ID: <1324136109-31504-4-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1324136109-31504-1-git-send-email-jengelh@medozas.de>
We need to visit that directory, otherwise `make install` is
incomplete and `make distcheck` fails.
---
Makefile.am | 2 +-
configure.ac | 2 +-
include/Makefile.am | 1 -
include/libipset/Makefile.am | 3 +--
4 files changed, 3 insertions(+), 5 deletions(-)
delete mode 100644 include/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 09ba4d9..513d641 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ else
V=0
endif
-SUBDIRS = lib src
+SUBDIRS = include/libipset lib src
modules_sparse:
if WITH_KMOD
diff --git a/configure.ac b/configure.ac
index e277d05..acae162 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,5 +161,5 @@ fi
dnl Checks for library functions.
dnl Generate output
-AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile])
+AC_CONFIG_FILES([Makefile include/libipset/Makefile lib/Makefile src/Makefile])
AC_OUTPUT
diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index 2c4eb5c..0000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = libipset
diff --git a/include/libipset/Makefile.am b/include/libipset/Makefile.am
index b17293c..3c21d0f 100644
--- a/include/libipset/Makefile.am
+++ b/include/libipset/Makefile.am
@@ -6,11 +6,10 @@ pkginclude_HEADERS = \
linux_ip_set_hash.h \
mnl.h \
nf_inet_addr.h \
- nlattr.h \
parse.h \
pfxlen.h \
print.h \
- session.h
+ session.h \
transport.h \
types.h \
ui.h \
--
1.7.3.4
next prev parent reply other threads:[~2011-12-17 15:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-17 15:35 ipset: build updates Jan Engelhardt
2011-12-17 15:35 ` [PATCH 1/6] Update .gitignore Jan Engelhardt
2011-12-17 15:35 ` [PATCH 2/6] build: use AC_CONFIG_AUX_DIR and stash away tools Jan Engelhardt
2011-12-17 15:35 ` Jan Engelhardt [this message]
2011-12-17 15:35 ` [PATCH 4/6] build: include libipset/nfproto.h Jan Engelhardt
2011-12-17 15:35 ` [PATCH 5/6] build: install libipset/linux_ip_set_list.h Jan Engelhardt
2011-12-17 15:35 ` [PATCH 6/6] build: make distcheck work and use POSIX mode for tarball generation Jan Engelhardt
2011-12-23 20:31 ` ipset: build updates Jozsef Kadlecsik
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=1324136109-31504-4-git-send-email-jengelh@medozas.de \
--to=jengelh@medozas.de \
--cc=kadlec@blackhole.kfki.hu \
--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).