nspawn: add new --network-interface= switch to move an existing interface into the...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 09a827b02f161a6e604cf08a2569af0d758088cf..713a3aad93f9f0f4b80f89c1d56a3d6fef9484a6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -644,7 +644,8 @@ EXTRA_DIST += \
        tools/make-man-index.py \
        tools/make-directive-index.py \
        tools/make-man-rules.py \
-       tools/xml_helper.py
+       tools/xml_helper.py \
+       man/less-variables.xml
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -653,8 +654,6 @@ noinst_LTLIBRARIES += \
 libsystemd_shared_la_SOURCES = \
        src/shared/linux/auto_dev-ioctl.h \
        src/shared/linux/fanotify.h \
-       src/shared/linux/seccomp.h \
-       src/shared/linux/seccomp-bpf.h \
        src/shared/ioprio.h \
        src/shared/missing.h \
        src/shared/initreq.h \
@@ -762,8 +761,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/net-util.h \
        src/shared/errno-list.c \
        src/shared/errno-list.h \
-       src/shared/syscall-list.c \
-       src/shared/syscall-list.h \
        src/shared/audit.c \
        src/shared/audit.h \
        src/shared/xml.c \
@@ -771,9 +768,13 @@ libsystemd_shared_la_SOURCES = \
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
-       src/shared/errno-to-name.h \
-       src/shared/syscall-from-name.h \
-       src/shared/syscall-to-name.h
+       src/shared/errno-to-name.h
+
+if HAVE_SECCOMP
+libsystemd_shared_la_SOURCES += \
+       src/shared/seccomp-util.h \
+       src/shared/seccomp-util.c
+endif
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -998,6 +999,7 @@ libsystemd_core_la_CFLAGS = \
        $(PAM_CFLAGS) \
        $(AUDIT_CFLAGS) \
        $(KMOD_CFLAGS) \
+       $(SECCOMP_CFLAGS) \
        -pthread
 
 libsystemd_core_la_LIBADD = \
@@ -1012,6 +1014,7 @@ libsystemd_core_la_LIBADD = \
        $(PAM_LIBS) \
        $(AUDIT_LIBS) \
        $(CAP_LIBS) \
+       $(SECCOMP_LIBS) \
        $(KMOD_LIBS)
 
 src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
@@ -1025,33 +1028,13 @@ CLEANFILES += \
        src/core/load-fragment-gperf.gperf \
        src/core/load-fragment-gperf.c \
        src/core/load-fragment-gperf-nulstr.c \
-       src/shared/syscall-list.txt \
-       src/shared/syscall-from-name.gperf \
        src/shared/errno-list.txt \
        src/shared/errno-from-name.gperf
 
 BUILT_SOURCES += \
-       src/shared/syscall-from-name.h \
-       src/shared/syscall-to-name.h \
        src/shared/errno-from-name.h \
        src/shared/errno-to-name.h
 
-src/shared/syscall-list.txt:
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9(]/ { sub(/__NR_/, "", $$2); if ($$2 !~ /SYSCALL_BASE/) print $$2; }' > $@
-
-src/shared/syscall-from-name.gperf: src/shared/syscall-list.txt
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
-
-src/shared/syscall-from-name.h: src/shared/syscall-from-name.gperf
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@
-
-src/shared/syscall-to-name.h: src/shared/syscall-list.txt
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const syscall_names[] = { "} { printf "[SYSCALL_TO_INDEX(__NR_%s)] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
-
 src/shared/errno-list.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+[0-9]/ { print $$2; }'  > $@
@@ -2350,6 +2333,7 @@ libsystemd_dhcp_la_SOURCES = \
        src/libsystemd-dhcp/dhcp-lease.c \
        src/libsystemd-dhcp/dhcp-network.c \
        src/libsystemd-dhcp/dhcp-option.c \
+       src/libsystemd-dhcp/dhcp-packet.c \
        src/libsystemd-dhcp/dhcp-internal.h \
        src/libsystemd-dhcp/dhcp-protocol.h
 
@@ -4644,7 +4628,7 @@ if ENABLE_MANPAGES
 man/custom-entities.ent:
        $(AM_V_GEN)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)(echo '<?xml version="1.0" encoding="utf-8" ?>' && \
-        echo '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">,$(substitutions))))') \
+        printf '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">\n,$(substitutions))))') \
         > $@ # '
 
 DISTCLEANFILES += \
@@ -4652,6 +4636,7 @@ DISTCLEANFILES += \
 
 XSLTPROC_FLAGS = \
        --nonet \
+       --xinclude \
        --stringparam man.output.quietly 1 \
        --stringparam funcsynopsis.style ansi \
        --stringparam man.authors.section.enabled 0 \