From: Jan Engelhardt <jengelh@medozas.de>
Date: Sat, 17 Dec 2011 15:35:05 +0000 (+0100)
Subject: build: process include/libipset/
X-Git-Tag: v6.11~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=056b0ea7b9c66b84842834d92e112db2b4e4d9aa;p=ipset

build: process include/libipset/

We need to visit that directory, otherwise `make install` is
incomplete and `make distcheck` fails.

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
---

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 \