util-lib: split out IO related calls to io-util.[ch]

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8ba4e0e389d8a82a631cc0ea19c6098480ab2feb..459d54460cad775588ec8e2051a8a2ec2282a9d7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -616,7 +616,8 @@ EXTRA_DIST += \
        units/initrd-udevadm-cleanup-db.service.in \
        units/initrd-switch-root.service.in \
        units/systemd-nspawn@.service.in \
-       units/systemd-update-done.service.in
+       units/systemd-update-done.service.in \
+    units/tmp.mount.m4
 
 if HAVE_SYSV_COMPAT
 nodist_systemunit_DATA += \
@@ -780,6 +781,16 @@ libbasic_la_SOURCES = \
        src/basic/refcnt.h \
        src/basic/util.c \
        src/basic/util.h \
+       src/basic/io-util.c \
+       src/basic/io-util.h \
+       src/basic/string-util.c \
+       src/basic/string-util.h \
+       src/basic/fd-util.c \
+       src/basic/fd-util.h \
+       src/basic/extract-word.c \
+       src/basic/extract-word.h \
+       src/basic/escape.c \
+       src/basic/escape.h \
        src/basic/cpu-set-util.c \
        src/basic/cpu-set-util.h \
        src/basic/lockfile-util.c \
@@ -898,7 +909,8 @@ libbasic_la_SOURCES = \
        src/basic/rm-rf.c \
        src/basic/rm-rf.h \
        src/basic/copy.c \
-       src/basic/copy.h
+       src/basic/copy.h \
+       src/basic/formats-util.h
 
 nodist_libbasic_la_SOURCES = \
        src/basic/errno-from-name.h \
@@ -938,7 +950,6 @@ libshared_la_SOURCES = \
        src/shared/architecture.h \
        src/shared/efivars.c \
        src/shared/efivars.h \
-       src/shared/formats-util.h \
        src/shared/fstab-util.c \
        src/shared/fstab-util.h \
        src/shared/sleep-config.c \
@@ -3214,7 +3225,7 @@ libsystemd_network_la_SOURCES = \
        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-ndisc.h \
        src/systemd/sd-dhcp6-client.h \
        src/systemd/sd-dhcp6-lease.h \
        src/systemd/sd-pppoe.h \
@@ -3236,7 +3247,9 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/sd-pppoe.c \
        src/libsystemd-network/network-internal.c \
        src/libsystemd-network/network-internal.h \
-       src/libsystemd-network/sd-icmp6-nd.c \
+       src/libsystemd-network/sd-ndisc.c \
+       src/libsystemd-network/icmp6-util.h \
+       src/libsystemd-network/icmp6-util.c \
        src/libsystemd-network/sd-dhcp6-client.c \
        src/libsystemd-network/dhcp6-internal.h \
        src/libsystemd-network/dhcp6-protocol.h \
@@ -3320,15 +3333,15 @@ test_pppoe_LDADD = \
        libsystemd-network.la \
        libshared.la
 
-test_icmp6_rs_SOURCES = \
+test_ndisc_rs_SOURCES = \
        src/systemd/sd-dhcp6-client.h \
-       src/systemd/sd-icmp6-nd.h \
-       src/libsystemd-network/dhcp6-internal.h \
-       src/libsystemd-network/test-icmp6-rs.c \
+       src/systemd/sd-ndisc.h \
+       src/libsystemd-network/icmp6-util.h \
+       src/libsystemd-network/test-ndisc-rs.c \
        src/libsystemd-network/dhcp-identifier.h \
        src/libsystemd-network/dhcp-identifier.c
 
-test_icmp6_rs_LDADD = \
+test_ndisc_rs_LDADD = \
        libsystemd-network.la \
        libudev.la \
        libshared.la
@@ -3360,7 +3373,7 @@ tests += \
        test-dhcp-client \
        test-dhcp-server \
        test-ipv4ll \
-       test-icmp6-rs \
+       test-ndisc-rs \
        test-dhcp6-client \
        test-lldp
 
@@ -3826,6 +3839,7 @@ endif
 if HAVE_GNUTLS
 systemd_journal_remote_LDADD += \
        $(GNUTLS_LIBS)
+endif
 
 # systemd-journal-remote make sense mostly with full crypto stack
 dist_systemunit_DATA += \
@@ -3840,7 +3854,6 @@ journal-remote-install-hook: journal-install-hook
        -chmod 755 $(DESTDIR)/var/log/journal/remote
 
 INSTALL_EXEC_HOOKS += journal-remote-install-hook
-endif
 
 nodist_pkgsysconf_DATA += \
        src/journal-remote/journal-remote.conf
@@ -5230,6 +5243,7 @@ libnetworkd_core_la_SOURCES = \
        src/network/networkd-ipv4ll.c \
        src/network/networkd-dhcp4.c \
        src/network/networkd-dhcp6.c \
+       src/network/networkd-ndisc.c \
        src/network/networkd-network.h \
        src/network/networkd-network.c \
        src/network/networkd-network-bus.c \