build: fix some problems seen with 'make dist' tarballs

Signed-off-by: Paul Moore <pmoore@redhat.com>

6 files changed, 77 insertions, 2 deletions

diff --git a/Makefile.am b/Makefile.am
index 71fde48..a81b6fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,6 +22,8 @@ SUBDIRS = include src tools tests doc
 pkgconfdir = ${libdir}/pkgconfig
 pkgconf_DATA = libseccomp.pc
 
+EXTRA_DIST = CHANGELOG CREDITS LICENSE README SUBMITTING_PATCHES
+
 # support silent builds
 AM_MAKEFLAGS_0 = --quiet --no-print-directory
 AM_MAKEFLAGS_1 =
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 528cfd5..0ede147 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -16,10 +16,10 @@
 # along with this library; if not, see <http://www.gnu.org/licenses>.
 #
 
-man1_MANS = \
+dist_man1_MANS = \
 	man/man1/scmp_sys_resolver.1
 
-man3_MANS = \
+dist_man3_MANS = \
 	man/man3/seccomp_arch_add.3 \
 	man/man3/seccomp_arch_exist.3 \
 	man/man3/seccomp_arch_native.3 \
diff --git a/src/Makefile.am b/src/Makefile.am
index 9b2bc13..d8fbd85 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,6 +38,8 @@ SOURCES_GEN = \
 	hash.h hash.c \
 	gen_pfc.h gen_pfc.c gen_bpf.h gen_bpf.c
 
+EXTRA_DIST = arch-syscall-validate
+
 TESTS = arch-syscall-check
 
 check_PROGRAMS = arch-syscall-check arch-syscall-dump
diff --git a/src/python/Makefile.am b/src/python/Makefile.am
index 2a57b99..7933a4e 100644
--- a/src/python/Makefile.am
+++ b/src/python/Makefile.am
@@ -33,6 +33,8 @@ PY_BUILD = ${PY_BUILD_@AM_V@}
 
 PY_INSTALL = ${PY_DISTUTILS} install
 
+EXTRA_DIST = libseccomp.pxd seccomp.pyx setup.py
+
 all-local: build
 
 build: ../libseccomp.la libseccomp.pxd seccomp.pyx setup.py
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4cda5d6..edb50a3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -53,6 +53,73 @@ check_PROGRAMS = \
 	25-sim-multilevel_chains_adv \
 	26-sim-arch_all_be_basic
 
+EXTRA_DIST_TESTPYTHON = \
+	util.py \
+	01-sim-allow.py \
+	02-sim-basic.py \
+	03-sim-basic_chains.py \
+	04-sim-multilevel_chains.py \
+	05-sim-long_jumps.py \
+	06-sim-actions.py \
+	07-sim-db_bug_looping.py \
+	08-sim-subtree_checks.py \
+	09-sim-syscall_priority_pre.py \
+	10-sim-syscall_priority_post.py \
+	11-basic-basic_errors.py \
+	12-sim-basic_masked_ops.py \
+	13-basic-attrs.py \
+	14-sim-reset.py \
+	15-basic-resolver.py \
+	16-sim-arch_basic.py \
+	17-sim-arch_merge.py \
+	18-sim-basic_whitelist.py \
+	19-sim-missing_syscalls.py \
+	20-live-basic_die.py \
+	21-live-basic_allow.py \
+	22-sim-basic_chains_array.py \
+	23-sim-arch_all_le_basic.py \
+	24-live-arg_allow.py \
+	25-sim-multilevel_chains_adv.py \
+	26-sim-arch_all_be_basic.py
+
+EXTRA_DIST_TESTCFGS = \
+	01-sim-allow.tests \
+	02-sim-basic.tests \
+	03-sim-basic_chains.tests \
+	04-sim-multilevel_chains.tests \
+	05-sim-long_jumps.tests \
+	06-sim-actions.tests \
+	07-sim-db_bug_looping.tests \
+	08-sim-subtree_checks.tests \
+	09-sim-syscall_priority_pre.tests \
+	10-sim-syscall_priority_post.tests \
+	11-basic-basic_errors.tests \
+	12-sim-basic_masked_ops.tests \
+	13-basic-attrs.tests \
+	14-sim-reset.tests \
+	15-basic-resolver.tests \
+	16-sim-arch_basic.tests \
+	17-sim-arch_merge.tests \
+	18-sim-basic_whitelist.tests \
+	19-sim-missing_syscalls.tests \
+	20-live-basic_die.tests \
+	21-live-basic_allow.tests \
+	22-sim-basic_chains_array.tests \
+	23-sim-arch_all_le_basic.tests \
+	24-live-arg_allow.tests \
+	25-sim-multilevel_chains_adv.tests \
+	26-sim-arch_all_be_basic.tests
+
+EXTRA_DIST_TESTSCRIPTS = regression testdiff testgen
+
+EXTRA_DIST_TESTVALGRIND = valgrind_test.supp
+
+EXTRA_DIST = \
+	${EXTRA_DIST_TESTCFGS} \
+	${EXTRA_DIST_TESTPYTHON} \
+	${EXTRA_DIST_TESTSCRIPTS} \
+	${EXTRA_DIST_TESTVALGRIND}
+
 EXTRA_PROGRAMS = 00-test
 
 check-build:
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3401110..422b35d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -27,6 +27,8 @@ noinst_PROGRAMS = \
 	scmp_bpf_disasm \
 	scmp_bpf_sim
 
+EXTRA_DIST = check-syntax scmp_app_inspector
+
 scmp_bpf_disasm_SOURCES = scmp_bpf_disasm.c bpf.h util.h
 scmp_bpf_sim_SOURCES = scmp_bpf_sim.c bpf.h util.h