| Message ID | 152519602513.23091.18362364133607386698.stgit@endurance |
|---|---|
| State | Accepted |
| Delegated to: | Florian Westphal |
| Headers | show |
| Series | [nft] libnftables: fix header export | expand |
diff --git a/include/nftables.h b/include/nftables.h index 5f2da8b..f525ba6 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 9e31d51..5cfb0c6 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 similarity index 100% rename from include/nftables/nftables.h rename to include/nftables/libnftables.h diff --git a/src/libnftables.c b/src/libnftables.c index fe5143f..df4f092 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 1f08dfe..d26ea01 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>
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> --- include/nftables.h | 2 +- include/nftables/Makefile.am | 2 +- include/nftables/libnftables.h | 0 src/libnftables.c | 2 +- src/main.c | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename include/nftables/{nftables.h => libnftables.h} (100%) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html