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 09ba4d94fd6ce9b9f60711e6d77968ce70b53786..513d6413d794d3fc70b615ef6da6dc1fb3295543 100644 (file)
--- 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 e277d05ba9c5a7a4a2d7749a2fb233798539b8ca..acae162dc96cd5de4b84c1e4fac22332c1b0cfdd 100644 (file)
--- 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 (file)
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 b17293c8e497c53307d2787213d53899a1c8004a..3c21d0feda088962d535d738a3235cd7fc8f3a1b 100644 (file)
--- 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 \