There are also some minor cosmetic tweaks to the files. Signed-off-by: Paul Moore <[email protected]> --- Makefile.am | 19 +++++++++++++++++-- autogen.sh | 23 ++++++++++++++++++++--- configure.ac | 17 +++++++++++++++++ doc/Makefile.am | 18 +++++++++++++++++- include/Makefile.am | 18 +++++++++++++++++- src/Makefile.am | 19 +++++++++++++++++-- src/python/Makefile.am | 18 +++++++++++++++++- tests/Makefile.am | 20 ++++++++++++++++++-- tools/Makefile.am | 30 +++++++++++++++++++++++++----- 9 files changed, 165 insertions(+), 17 deletions(-)
diff --git a/Makefile.am b/Makefile.am index b5e6aca..b65ae32 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,23 @@ -# -*- Makefile -*- +#### +# Seccomp Library +# + +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of version 2.1 of the GNU Lesser General Public License +# as published by the Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, see <http://www.gnu.org/licenses>. +# ACLOCAL_AMFLAGS = -I m4 SUBDIRS = include src tools tests doc pkgconfdir = ${libdir}/pkgconfig pkgconf_DATA = libseccomp.pc - diff --git a/autogen.sh b/autogen.sh index 1b46ee4..d1fc1f2 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,23 @@ #!/bin/sh -e +# +# Seccomp Library Autotools Configure Script +# + +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of version 2.1 of the GNU Lesser General Public License +# as published by the Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, see <http://www.gnu.org/licenses>. +# + test -d m4 || mkdir m4 -autoreconf -fi; -rm -Rf autom4te.cache; -# do not call configure - this is unexpected +autoreconf -fi +rm -rf autom4te.cache diff --git a/configure.ac b/configure.ac index dcd9a9f..be2ffd5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,3 +1,20 @@ +dnl #### +dnl # Seccomp Library +dnl # + +dnl # +dnl # This library is free software; you can redistribute it and/or modify it +dnl # under the terms of version 2.1 of the GNU Lesser General Public License +dnl # as published by the Free Software Foundation. +dnl # +dnl # This library is distributed in the hope that it will be useful, but +dnl # WITHOUT ANY WARRANTY; without even the implied warranty of +dnl # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +dnl # General Public License for more details. +dnl # +dnl # You should have received a copy of the GNU Lesser General Public License +dnl # along with this library; if not, see <http://www.gnu.org/licenses>. +dnl # dnl #### dnl libseccomp defines diff --git a/doc/Makefile.am b/doc/Makefile.am index cdfcfda..ea1705e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,20 @@ -# -*- Makefile -*- +#### +# Seccomp Library Documentation +# + +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of version 2.1 of the GNU Lesser General Public License +# as published by the Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, see <http://www.gnu.org/licenses>. +# man1_MANS = \ man/man1/scmp_sys_resolver.1 diff --git a/include/Makefile.am b/include/Makefile.am index ba02470..ba3723f 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,3 +1,19 @@ -# -*- Makefile -*- +#### +# Seccomp Library Header Files +# + +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of version 2.1 of the GNU Lesser General Public License +# as published by the Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, see <http://www.gnu.org/licenses>. +# include_HEADERS = seccomp.h diff --git a/src/Makefile.am b/src/Makefile.am index 59a1574..5062c55 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,20 @@ -# -*- Makefile -*- +#### +# Seccomp Library Source Files +# + +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of version 2.1 of the GNU Lesser General Public License +# as published by the Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, see <http://www.gnu.org/licenses>. +# SUBDIRS = . if ENABLE_PYTHON @@ -28,4 +44,3 @@ libseccomp_la_SOURCES = ${SOURCES} libseccomp_la_CFLAGS = -fvisibility=hidden libseccomp_la_LDFLAGS = \ -version-number ${VERSION_MAJOR}:${VERSION_MINOR}:${VERSION_MICRO} - diff --git a/src/python/Makefile.am b/src/python/Makefile.am index 1559984..27b4188 100644 --- a/src/python/Makefile.am +++ b/src/python/Makefile.am @@ -1,4 +1,20 @@ -# -*- Makefile -*- +#### +# Seccomp Library Python Bindings +# + +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of version 2.1 of the GNU Lesser General Public License +# as published by the Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, see <http://www.gnu.org/licenses>. +# PYTHON = /usr/bin/env python diff --git a/tests/Makefile.am b/tests/Makefile.am index 5a9a112..7cda78b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,20 @@ -# -*- Makefile -*- +#### +# Seccomp Library Tests +# + +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of version 2.1 of the GNU Lesser General Public License +# as published by the Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, see <http://www.gnu.org/licenses>. +# AM_LDFLAGS = -static LDADD = util.la ../src/libseccomp-internal.la @@ -40,4 +56,4 @@ check_PROGRAMS = \ EXTRA_PROGRAMS = 00-test clean-local: - ${RM} -f 00-test + ${RM} -f 00-test *.pyc diff --git a/tools/Makefile.am b/tools/Makefile.am index 8109ce4..a88df73 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,13 +1,33 @@ -# -*- Makefile -*- +#### +# Seccomp Library Utility Tools +# + +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of version 2.1 of the GNU Lesser General Public License +# as published by the Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library; if not, see <http://www.gnu.org/licenses>. +# noinst_LTLIBRARIES = util.la util_la_SOURCES = util.c util.h util_la_LDFLAGS = -module -bin_PROGRAMS = scmp_sys_resolver -noinst_PROGRAMS = scmp_arch_detect scmp_bpf_disasm scmp_bpf_sim +bin_PROGRAMS = \ + scmp_sys_resolver +noinst_PROGRAMS = \ + scmp_arch_detect \ + scmp_bpf_disasm \ + scmp_bpf_sim -scmp_sys_resolver_LDADD = ../src/libseccomp-internal.la -scmp_arch_detect_LDADD = ../src/libseccomp-internal.la +scmp_sys_resolver_LDADD = ../src/libseccomp-internal.la +scmp_arch_detect_LDADD = ../src/libseccomp-internal.la scmp_bpf_disasm_LDADD = util.la scmp_bpf_sim_LDADD = util.la ------------------------------------------------------------------------------ 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
