Merge pull request #986 from karelzak/monitor

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 57dfee7cc8c9e1aa1e4e8dd0bfc9890cb09cf90a..3cc27cbbfce7c85e1efdb79a55fbb8d32f663e33 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -474,6 +474,7 @@ dist_systemunit_DATA = \
        units/getty.target \
        units/halt.target \
        units/kexec.target \
+       units/exit.target \
        units/local-fs.target \
        units/local-fs-pre.target \
        units/initrd.target \
@@ -550,6 +551,7 @@ nodist_systemunit_DATA = \
        units/systemd-poweroff.service \
        units/systemd-reboot.service \
        units/systemd-kexec.service \
+       units/systemd-exit.service \
        units/systemd-fsck@.service \
        units/systemd-fsck-root.service \
        units/systemd-machine-id-commit.service \
@@ -601,6 +603,7 @@ EXTRA_DIST += \
        units/systemd-poweroff.service.in \
        units/systemd-reboot.service.in \
        units/systemd-kexec.service.in \
+       units/systemd-exit.service.in \
        units/user/systemd-exit.service.in \
        units/systemd-fsck@.service.in \
        units/systemd-fsck-root.service.in \
@@ -1368,7 +1371,9 @@ manual_tests += \
        test-watchdog \
        test-log \
        test-ipcrm \
-       test-btrfs
+       test-btrfs \
+       test-acd \
+       test-ipv4ll-manual
 
 if HAVE_LIBIPTC
 manual_tests += \
@@ -3209,6 +3214,7 @@ libsystemd_network_la_SOURCES = \
        src/systemd/sd-dhcp-server.h \
        src/systemd/sd-dhcp-lease.h \
        src/systemd/sd-ipv4ll.h \
+       src/systemd/sd-ipv4acd.h \
        src/systemd/sd-icmp6-nd.h \
        src/systemd/sd-dhcp6-client.h \
        src/systemd/sd-dhcp6-lease.h \
@@ -3225,9 +3231,9 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/dhcp-lease-internal.h \
        src/libsystemd-network/sd-dhcp-lease.c \
        src/libsystemd-network/sd-ipv4ll.c \
-       src/libsystemd-network/ipv4ll-network.c \
-       src/libsystemd-network/ipv4ll-packet.c \
-       src/libsystemd-network/ipv4ll-internal.h \
+       src/libsystemd-network/sd-ipv4acd.c \
+       src/libsystemd-network/arp-util.h \
+       src/libsystemd-network/arp-util.c \
        src/libsystemd-network/sd-pppoe.c \
        src/libsystemd-network/network-internal.c \
        src/libsystemd-network/network-internal.h \
@@ -3284,13 +3290,29 @@ test_dhcp_server_LDADD = \
 
 test_ipv4ll_SOURCES = \
        src/systemd/sd-ipv4ll.h \
-       src/libsystemd-network/ipv4ll-internal.h \
+       src/libsystemd-network/arp-util.h \
        src/libsystemd-network/test-ipv4ll.c
 
 test_ipv4ll_LDADD = \
        libsystemd-network.la \
        libshared.la
 
+test_ipv4ll_manual_SOURCES = \
+       src/systemd/sd-ipv4ll.h \
+       src/libsystemd-network/test-ipv4ll-manual.c
+
+test_ipv4ll_manual_LDADD = \
+       libsystemd-network.la \
+       libshared.la
+
+test_acd_SOURCES = \
+       src/systemd/sd-ipv4acd.h \
+       src/libsystemd-network/test-acd.c
+
+test_acd_LDADD = \
+       libsystemd-network.la \
+       libshared.la
+
 test_pppoe_SOURCES = \
        src/systemd/sd-pppoe.h \
        src/libsystemd-network/test-pppoe.c