nspawn: when adding a veth interface to a bridge, use the "vb-" rather than "ve-...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 08b94d7b1483f7d1e662e6d3a937e95e7d56b893..6f8d3b5a29be4d05416ac811367d32c046e618c1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -674,6 +674,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/util.h \
        src/shared/virt.c \
        src/shared/virt.h \
+       src/shared/architecture.c \
+       src/shared/architecture.h \
        src/shared/efivars.c \
        src/shared/efivars.h \
        src/shared/path-util.c \
@@ -766,7 +768,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/audit.c \
        src/shared/audit.h \
        src/shared/xml.c \
-       src/shared/xml.h
+       src/shared/xml.h \
+       src/shared/condition-util.c \
+       src/shared/condition-util.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -1016,6 +1020,7 @@ libsystemd_core_la_CFLAGS = \
        $(AUDIT_CFLAGS) \
        $(CAP_CFLAGS) \
        $(KMOD_CFLAGS) \
+       $(APPARMOR_CFLAGS) \
        $(SECCOMP_CFLAGS) \
        -pthread
 
@@ -1031,6 +1036,7 @@ libsystemd_core_la_LIBADD = \
        $(AUDIT_LIBS) \
        $(CAP_LIBS) \
        $(KMOD_LIBS) \
+       $(APPARMOR_LIBS) \
        $(SECCOMP_LIBS)
 
 if HAVE_SECCOMP
@@ -1148,7 +1154,8 @@ tests += \
        test-list \
        test-tables \
        test-device-nodes \
-       test-xml
+       test-xml \
+       test-architecture
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
@@ -1296,6 +1303,12 @@ test_time_SOURCES = \
 test_time_LDADD = \
        libsystemd-core.la
 
+test_architecture_SOURCES = \
+       src/test/test-architecture.c
+
+test_architecture_LDADD = \
+       libsystemd-shared.la
+
 test_log_SOURCES = \
        src/test/test-log.c
 
@@ -1726,6 +1739,9 @@ bootctl_LDADD = \
 bin_PROGRAMS += \
        bootctl
 
+dist_bashcompletion_DATA += \
+       shell-completion/bash/bootctl
+
 dist_zshcompletion_DATA += \
        shell-completion/zsh/_bootctl
 
@@ -1868,9 +1884,13 @@ systemd_nspawn_LDADD = \
        libsystemd-capability.la \
        libsystemd-internal.la \
        libudev-internal.la \
-       libsystemd-shared.la \
+       libsystemd-shared.la
+
+if HAVE_SECCOMP
+systemd_nspawn_LDADD += \
        libsystemd-seccomp.la \
        $(SECCOMP_LIBS)
+endif
 
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
@@ -3923,7 +3943,8 @@ systemd_networkd_SOURCES = \
        src/network/networkd-manager.c
 
 nodist_systemd_networkd_SOURCES = \
-       src/network/networkd-gperf.c
+       src/network/networkd-network-gperf.c \
+       src/network/networkd-netdev-gperf.c
 
 systemd_networkd_LDADD = \
        libudev-internal.la \
@@ -3947,7 +3968,8 @@ test_network_SOURCES = \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
        src/network/networkd-manager.c \
-       src/network/networkd-gperf.c
+       src/network/networkd-network-gperf.c \
+       src/network/networkd-netdev-gperf.c
 
 test_network_LDADD = \
        libudev-internal.la \
@@ -3960,11 +3982,13 @@ tests += \
        test-network
 
 EXTRA_DIST += \
-       src/network/networkd-gperf.gperf \
+       src/network/networkd-network-gperf.gperf \
+       src/network/networkd-netdev-gperf.gperf \
        units/systemd-networkd.service.in
 
 CLEANFILES += \
-       src/network/networkd-gperf.c
+       src/network/networkd-network-gperf.c \
+       src/network/networkd-netdev-gperf.c
 endif
 
 # ------------------------------------------------------------------------------
@@ -4245,7 +4269,8 @@ id128_la_LDFLAGS = \
 
 id128_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd.la
+       libsystemd.la \
+       libsystemd-shared.la
 
 _daemon_la_SOURCES = \
        src/python-systemd/_daemon.c \
@@ -4266,7 +4291,8 @@ _daemon_la_LDFLAGS = \
 
 _daemon_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
-       libsystemd.la
+       libsystemd.la \
+       libsystemd-shared.la
 
 _reader_la_SOURCES = \
        src/python-systemd/_reader.c \