Patchwork build: fix make distcheck

login
register
mail settings
Submitter Pablo Neira
Date Nov. 15, 2013, 2:23 p.m.
Message ID <1384525421-7063-1-git-send-email-pablo@netfilter.org>
Download mbox | patch
Permalink /patch/291579/
State Accepted
Headers show

Comments

Pablo Neira - Nov. 15, 2013, 2:23 p.m.
Fix missing files that were not included in the tarball
that distcheck generates.

This also includes AC_EXEEXT, otherwise configure complains about
undefined CHECK_GCC_FVISIBILITY.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 Makefile.am                         |    2 +-
 configure.ac                        |    1 +
 include/linux/netfilter/Makefile.am |    2 +-
 src/Makefile.am                     |    2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

Patch

diff --git a/Makefile.am b/Makefile.am
index d5f6e40..83f176d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@  include $(top_srcdir)/Make_global.am
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = src include examples tests
-DIST_SUBDIRS = src include examples
+DIST_SUBDIRS = src include examples tests
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnftables.pc
diff --git a/configure.ac b/configure.ac
index 4758a49..b023755 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,7 @@  AS_IF([test "x$with_json_parsing" = "xyes"], [
 ])
 AC_PROG_CC
 AM_PROG_CC_C_O
+AC_EXEEXT
 AC_DISABLE_STATIC
 LT_INIT
 CHECK_GCC_FVISIBILITY
diff --git a/include/linux/netfilter/Makefile.am b/include/linux/netfilter/Makefile.am
index 51fb1ae..442463c 100644
--- a/include/linux/netfilter/Makefile.am
+++ b/include/linux/netfilter/Makefile.am
@@ -1 +1 @@ 
-noinst_HEADERS = nfnetlink.h nf_tables.h
+noinst_HEADERS = nfnetlink.h nf_tables.h nf_tables_compat.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 5f64db2..48d5d2d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,5 +32,7 @@  libnftables_la_SOURCES = utils.c		\
 			 expr/payload.c		\
 			 expr/reject.c		\
 			 expr/target.c		\
+			 expr/data_reg.h	\
 			 libnftables.map	\
+			 expr_ops.h		\
 			 internal.h