summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArturo Borrero Gonzalez <arturo@netfilter.org>2018-05-01 19:33:45 +0200
committerFlorian Westphal <fw@strlen.de>2018-05-02 14:37:15 +0200
commita502ba00e44a03cbce9b5769274e1b604d3f08ad (patch)
tree13164767206ecba1e2c0b1b92f1dbc8eb470610e
parent64983d7cb595e773b13d8f3b656b30623d9fe430 (diff)
libnftables: fix header export
Instruct Make to actually install the header to the system, otherwise users won't see the header in their system after running 'make install'. Also, export main libnftables header with a proper name, since we have another private header called 'nftables.h' (i.e, let's be concrete with the naming). Signed-off-by: Arturo Borrero Gonzalez <arturo@netfilter.org> Signed-off-by: Florian Westphal <fw@strlen.de>
-rw-r--r--include/nftables.h2
-rw-r--r--include/nftables/Makefile.am2
-rw-r--r--include/nftables/libnftables.h (renamed from include/nftables/nftables.h)0
-rw-r--r--src/libnftables.c2
-rw-r--r--src/main.c2
5 files changed, 4 insertions, 4 deletions
diff --git a/include/nftables.h b/include/nftables.h
index 5f2da8b0..f525ba6b 100644
--- a/include/nftables.h
+++ b/include/nftables.h
@@ -5,7 +5,7 @@
#include <stdarg.h>
#include <limits.h>
#include <utils.h>
-#include <nftables/nftables.h>
+#include <nftables/libnftables.h>
struct cookie {
FILE *fp;
diff --git a/include/nftables/Makefile.am b/include/nftables/Makefile.am
index 9e31d519..5cfb0c6c 100644
--- a/include/nftables/Makefile.am
+++ b/include/nftables/Makefile.am
@@ -1 +1 @@
-noinst_HEADERS = nftables.h
+pkginclude_HEADERS = libnftables.h
diff --git a/include/nftables/nftables.h b/include/nftables/libnftables.h
index 652e0ca9..652e0ca9 100644
--- a/include/nftables/nftables.h
+++ b/include/nftables/libnftables.h
diff --git a/src/libnftables.c b/src/libnftables.c
index fe5143f6..df4f0922 100644
--- a/src/libnftables.c
+++ b/src/libnftables.c
@@ -6,7 +6,7 @@
* published by the Free Software Foundation.
*
*/
-#include <nftables/nftables.h>
+#include <nftables/libnftables.h>
#include <erec.h>
#include <mnl.h>
#include <parser.h>
diff --git a/src/main.c b/src/main.c
index 1f08dfec..d26ea018 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,7 +18,7 @@
#include <fcntl.h>
#include <sys/types.h>
-#include <nftables/nftables.h>
+#include <nftables/libnftables.h>
#include <utils.h>
#include <cli.h>