network: always take possession of host side of nspawn veth tunnels and do IPv4LL...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c54d35760daeec0ec00abacf0dc6a76c7c48c833..6e01188410934dbbb44271dd1ea91ad50ce74bd5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -801,6 +801,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/clean-ipc.c \
        src/shared/login-shared.c \
        src/shared/login-shared.h \
+       src/shared/ring.c \
+       src/shared/ring.h \
        src/shared/async.c \
        src/shared/async.h
 
@@ -1198,6 +1200,7 @@ tests += \
        test-utf8 \
        test-ellipsize \
        test-util \
+       test-ring \
        test-tmpfiles \
        test-namespace \
        test-date \
@@ -1325,6 +1328,12 @@ test_util_SOURCES = \
 test_util_LDADD = \
        libsystemd-core.la
 
+test_ring_SOURCES = \
+       src/test/test-ring.c
+
+test_ring_LDADD = \
+       libsystemd-core.la
+
 test_tmpfiles_SOURCES = \
        src/test/test-tmpfiles.c
 
@@ -2110,6 +2119,8 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-bus/bus-track.h \
        src/libsystemd/sd-bus/bus-util.c \
        src/libsystemd/sd-bus/bus-util.h \
+       src/libsystemd/sd-bus/bus-slot.c \
+       src/libsystemd/sd-bus/bus-slot.h \
        src/libsystemd/sd-bus/bus-protocol.h \
        src/libsystemd/sd-bus/kdbus.h \
        src/libsystemd/sd-bus/sd-memfd.c \
@@ -2470,6 +2481,10 @@ busctl_CFLAGS = \
 noinst_LTLIBRARIES += \
        libsystemd-network.la
 
+libsystemd_network_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(KMOD_CFLAGS)
+
 libsystemd_network_la_SOURCES = \
        src/systemd/sd-network.h \
        src/systemd/sd-dhcp-client.h \
@@ -2495,7 +2510,8 @@ libsystemd_network_la_SOURCES = \
 libsystemd_network_la_LIBADD = \
        libsystemd-label.la \
        libsystemd-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       $(KMOD_LIBS)
 
 test_dhcp_option_SOURCES = \
        src/libsystemd-network/dhcp-protocol.h \
@@ -2625,7 +2641,8 @@ INSTALL_DIRS += \
 
 dist_network_DATA = \
        network/99-default.link \
-       network/80-container-host0.network
+       network/80-container-host0.network \
+       network/80-container-ve.network
 
 dist_udevrules_DATA += \
        rules/42-usb-hid-pm.rules \
@@ -3671,6 +3688,19 @@ nodist_systemunit_DATA += \
        units/systemd-readahead-replay.service \
        units/systemd-readahead-done.service
 
+manual_tests += \
+       test-ssd
+
+test_ssd_SOURCES = \
+       src/readahead/test-ssd.c \
+       src/readahead/readahead-common.c \
+       src/readahead/readahead-common.h
+
+test_ssd_LDADD = \
+       libsystemd-internal.la \
+       libudev-internal.la \
+       libsystemd-shared.la
+
 endif
 
 EXTRA_DIST += \
@@ -4037,6 +4067,7 @@ systemd_timesyncd_LDADD = \
        libsystemd-shared.la \
        libsystemd-resolve.la \
        libsystemd-network.la \
+       libsystemd-capability.la \
        -lm
 
 rootlibexec_PROGRAMS += \
@@ -4172,11 +4203,15 @@ systemd_networkd_SOURCES = \
 
 systemd_networkd_LDADD = \
        libsystemd-networkd-core.la \
-       -lkmod
+       $(KMOD_LIBS)
 
 noinst_LTLIBRARIES += \
        libsystemd-networkd-core.la
 
+libsystemd_networkd_core_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(KMOD_CFLAGS)
+
 libsystemd_networkd_core_la_SOURCES = \
        src/libsystemd-network/network-internal.h \
        src/network/networkd.h \
@@ -4190,7 +4225,8 @@ libsystemd_networkd_core_la_SOURCES = \
 
 nodist_libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd-network-gperf.c \
-       src/network/networkd-netdev-gperf.c
+       src/network/networkd-netdev-gperf.c \
+       src/network/networkd-gperf.c
 
 libsystemd_networkd_core_la_LIBADD = \
        libudev-internal.la \
@@ -4199,17 +4235,13 @@ libsystemd_networkd_core_la_LIBADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
-nodist_systemunit_DATA += \
-       units/systemd-networkd.service \
-       units/systemd-networkd-wait-online.service
-
-GENERAL_ALIASES += \
-       $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
-       $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
-
 rootlibexec_PROGRAMS += \
        systemd-networkd-wait-online
 
+systemd_networkd_wait_online_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(KMOD_CFLAGS)
+
 systemd_networkd_wait_online_SOURCES = \
        src/libsystemd-network/network-internal.h \
        src/network/networkd-wait-online.c \
@@ -4226,21 +4258,36 @@ test_network_SOURCES = \
        src/network/test-network.c
 
 test_network_LDADD = \
-       libsystemd-networkd-core.la \
-       -lkmod
+       libsystemd-networkd-core.la
+       $(KMOD_LIBS)
 
 tests += \
        test-network
 
+nodist_systemunit_DATA += \
+       units/systemd-networkd.service \
+       units/systemd-networkd-wait-online.service
+
+GENERAL_ALIASES += \
+       $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
+       $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
+
+nodist_pkgsysconf_DATA += \
+       src/network/networkd.conf
+
 EXTRA_DIST += \
        src/network/networkd-network-gperf.gperf \
        src/network/networkd-netdev-gperf.gperf \
+       src/network/networkd-gperf.gperf \
        units/systemd-networkd.service.in \
-       units/systemd-networkd-wait-online.service.in
+       units/systemd-networkd-wait-online.service.in \
+       src/network/networkd.conf.in
 
 CLEANFILES += \
        src/network/networkd-network-gperf.c \
-       src/network/networkd-netdev-gperf.c
+       src/network/networkd-netdev-gperf.c \
+       src/network/networkd-gperf.c \
+       src/network/networkd.conf
 endif
 
 # ------------------------------------------------------------------------------
@@ -4794,7 +4841,8 @@ substitutions = \
        '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
        '|PYTHON=$(PYTHON)|' \
        '|PYTHON_BINARY=$(PYTHON_BINARY)|' \
-       '|NTP_SERVERS=$(NTP_SERVERS)|'
+       '|NTP_SERVERS=$(NTP_SERVERS)|' \
+       '|DNS_SERVERS=$(DNS_SERVERS)|'
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \