chiark / gitweb /
preset: ship a minimal preset file upstream
[elogind.git] / Makefile.am
index 53082cf2aba1481c0c39f67cf3e9e1a7159c8670..66eda99490ef788086fbadb2ffd2d3a7ac10eefb 100644 (file)
@@ -460,7 +460,8 @@ dist_systemunit_DATA = \
        units/systemd-udevd-control.socket \
        units/systemd-udevd-kernel.socket \
        units/system-update.target \
-       units/initrd-switch-root.target
+       units/initrd-switch-root.target \
+       units/ldconfig.service
 
 nodist_systemunit_DATA = \
        units/getty@.service \
@@ -508,6 +509,9 @@ dist_userunit_DATA = \
 nodist_userunit_DATA = \
        units/user/systemd-exit.service
 
+dist_systempreset_DATA = \
+       system-preset/90-systemd.preset
+
 EXTRA_DIST += \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
@@ -1232,7 +1236,9 @@ tests += \
        test-tables \
        test-device-nodes \
        test-xml \
-       test-architecture
+       test-architecture \
+       test-socket-util \
+       test-fdset
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
@@ -1336,12 +1342,24 @@ test_utf8_SOURCES = \
 test_utf8_LDADD = \
        libsystemd-shared.la
 
+test_fdset_SOURCES = \
+       src/test/test-fdset.c
+
+test_fdset_LDADD = \
+       libsystemd-core.la
+
 test_util_SOURCES = \
        src/test/test-util.c
 
 test_util_LDADD = \
        libsystemd-core.la
 
+test_socket_util_SOURCES = \
+       src/test/test-socket-util.c
+
+test_socket_util_LDADD = \
+       libsystemd-core.la
+
 test_ring_SOURCES = \
        src/test/test-ring.c
 
@@ -1782,7 +1800,7 @@ systemd_sysusers_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
-rootlibexec_PROGRAMS += \
+rootbin_PROGRAMS += \
        systemd-sysusers
 
 nodist_systemunit_DATA += \
@@ -2553,15 +2571,18 @@ libsystemd_network_la_CFLAGS = \
 libsystemd_network_la_SOURCES = \
        src/systemd/sd-network.h \
        src/systemd/sd-dhcp-client.h \
+       src/systemd/sd-dhcp-server.h \
        src/systemd/sd-dhcp-lease.h \
        src/systemd/sd-ipv4ll.h \
        src/network/sd-network.c \
        src/network/network-util.h \
        src/libsystemd-network/sd-dhcp-client.c \
+       src/libsystemd-network/sd-dhcp-server.c \
        src/libsystemd-network/dhcp-network.c \
        src/libsystemd-network/dhcp-option.c \
        src/libsystemd-network/dhcp-packet.c \
        src/libsystemd-network/dhcp-internal.h \
+       src/libsystemd-network/dhcp-server-internal.h \
        src/libsystemd-network/dhcp-protocol.h \
        src/libsystemd-network/dhcp-lease-internal.h \
        src/libsystemd-network/sd-dhcp-lease.c \
@@ -2601,6 +2622,14 @@ test_dhcp_client_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
+test_dhcp_server_SOURCES = \
+       src/libsystemd-network/test-dhcp-server.c
+
+test_dhcp_server_LDADD = \
+       libsystemd-network.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
 test_ipv4ll_SOURCES = \
        src/systemd/sd-ipv4ll.h \
        src/libsystemd-network/ipv4ll-internal.h \
@@ -2615,6 +2644,7 @@ test_ipv4ll_LDADD = \
 tests += \
        test-dhcp-option \
        test-dhcp-client \
+       test-dhcp-server \
        test-ipv4ll
 
 # ------------------------------------------------------------------------------
@@ -4345,6 +4375,7 @@ libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd-netdev.c \
        src/network/networkd-tunnel.c \
        src/network/networkd-veth.c \
+       src/network/networkd-vxlan.c \
        src/network/networkd-network.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
@@ -5130,7 +5161,8 @@ endif
 
 SYSINIT_TARGET_WANTS += \
        systemd-update-utmp.service \
-       systemd-update-done.service
+       systemd-update-done.service \
+       ldconfig.service
 
 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \