Signed-off-by: Paul Moore <[email protected]>
---
Makefile.am | 25 +------------------------
configure.ac | 8 +++++++-
doc/Makefile.am | 27 +++++++++++++++++++++++++++
include/Makefile.am | 3 +++
tools/Makefile.am | 3 ---
5 files changed, 38 insertions(+), 28 deletions(-)
create mode 100644 doc/Makefile.am
create mode 100644 include/Makefile.am
diff --git a/Makefile.am b/Makefile.am
index bf0a4ea..b5e6aca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,31 +1,8 @@
# -*- Makefile -*-
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src tools tests
+SUBDIRS = include src tools tests doc
pkgconfdir = ${libdir}/pkgconfig
pkgconf_DATA = libseccomp.pc
-nodist_include_HEADERS = include/seccomp.h
-
-dist_man_MANS = \
- doc/man/man1/scmp_sys_resolver.1 \
- doc/man/man3/seccomp_arch_add.3 \
- doc/man/man3/seccomp_arch_exist.3 \
- doc/man/man3/seccomp_arch_native.3 \
- doc/man/man3/seccomp_arch_remove.3 \
- doc/man/man3/seccomp_attr_get.3 \
- doc/man/man3/seccomp_attr_set.3 \
- doc/man/man3/seccomp_export_bpf.3 \
- doc/man/man3/seccomp_export_pfc.3 \
- doc/man/man3/seccomp_init.3 \
- doc/man/man3/seccomp_load.3 \
- doc/man/man3/seccomp_merge.3 \
- doc/man/man3/seccomp_release.3 \
- doc/man/man3/seccomp_reset.3 \
- doc/man/man3/seccomp_rule_add.3 \
- doc/man/man3/seccomp_rule_add_exact.3 \
- doc/man/man3/seccomp_syscall_priority.3 \
- doc/man/man3/seccomp_syscall_resolve_name.3 \
- doc/man/man3/seccomp_syscall_resolve_name_arch.3 \
- doc/man/man3/seccomp_syscall_resolve_num_arch.3
diff --git a/configure.ac b/configure.ac
index 5df8be5..b6788ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,6 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_DISABLE_STATIC
LT_INIT
-AC_CHECK_HEADER([linux/seccomp.h])
AM_CPPFLAGS="-I\${top_srcdir}/include"
AM_CFLAGS="-Wall"
@@ -25,6 +24,11 @@ AC_SUBST([AM_CFLAGS])
AC_SUBST([AM_LDFLAGS])
dnl ####
+dnl check build system seccomp awareness
+dnl ####
+AC_CHECK_HEADERS_ONCE([linux/seccomp.h])
+
+dnl ####
dnl version information
dnl ####
VERSION_MAJOR=$(echo ${VERSION} | cut -d'.' -f 1)
@@ -77,10 +81,12 @@ dnl makefiles
dnl ####
AC_CONFIG_FILES([
Makefile
+ include/Makefile
src/Makefile
src/python/Makefile
tools/Makefile
tests/Makefile
+ doc/Makefile
])
dnl ####
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..cdfcfda
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,27 @@
+# -*- Makefile -*-
+
+man1_MANS = \
+ man/man1/scmp_sys_resolver.1
+
+man3_MANS = \
+ man/man3/seccomp_arch_add.3 \
+ man/man3/seccomp_arch_exist.3 \
+ man/man3/seccomp_arch_native.3 \
+ man/man3/seccomp_arch_remove.3 \
+ man/man3/seccomp_attr_get.3 \
+ man/man3/seccomp_attr_set.3 \
+ man/man3/seccomp_export_bpf.3 \
+ man/man3/seccomp_export_pfc.3 \
+ man/man3/seccomp_init.3 \
+ man/man3/seccomp_load.3 \
+ man/man3/seccomp_merge.3 \
+ man/man3/seccomp_release.3 \
+ man/man3/seccomp_reset.3 \
+ man/man3/seccomp_rule_add.3 \
+ man/man3/seccomp_rule_add_array.3 \
+ man/man3/seccomp_rule_add_exact.3 \
+ man/man3/seccomp_rule_add_exact_array.3 \
+ man/man3/seccomp_syscall_priority.3 \
+ man/man3/seccomp_syscall_resolve_name.3 \
+ man/man3/seccomp_syscall_resolve_name_arch.3 \
+ man/man3/seccomp_syscall_resolve_num_arch.3
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000..ba02470
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,3 @@
+# -*- Makefile -*-
+
+include_HEADERS = seccomp.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 28087e9..d74c07f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,7 +1,6 @@
# -*- Makefile -*-
noinst_LTLIBRARIES = util.la
-
util_la_SOURCES = util.c util.h
util_la_LDFLAGS = -module
@@ -12,5 +11,3 @@ scmp_sys_resolver_LDADD = ../src/libseccomp.la
scmp_arch_detect_LDADD = ../src/libseccomp.la
scmp_bpf_disasm_LDADD = util.la
scmp_bpf_sim_LDADD = util.la
-
-EXTRA_DIST = bpf.h
------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
• 3 signs your SCM is hindering your productivity
• Requirements for releasing software faster
• Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce
_______________________________________________
libseccomp-discuss mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/libseccomp-discuss
