diff options
| author | Patrik Flykt <patrik.flykt@linux.intel.com> | 2015-10-22 20:41:50 +0300 |
|---|---|---|
| committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2015-10-22 20:41:50 +0300 |
| commit | b8c89d3c4255e1f2ad9bf49eabe89d50c419783e (patch) | |
| tree | 102fa25c9691276d0fb0f72dc929b9e7860b2f55 /Makefile.am | |
| parent | ac691d4abe0970e9255525d1cc6187e553639fea (diff) | |
| parent | cbe91b3cba3298866f51abfa598c5751e90fd390 (diff) | |
Merge pull request #1625 from teg/ndisc
sd-ndisc: Rename (from sd-icmp6-nd) and prepare for handling SLAAC and router discovery
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index e210d8a2da..fa25485b73 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3214,7 +3214,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 +3236,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 +3322,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 +3362,7 @@ tests += \ test-dhcp-client \ test-dhcp-server \ test-ipv4ll \ - test-icmp6-rs \ + test-ndisc-rs \ test-dhcp6-client \ test-lldp @@ -5230,6 +5232,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 \ |