diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-08-12 02:12:05 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-08-12 02:12:05 +0200 |
| commit | a903fd34c0e30b82f4264ea25553535edefdee08 (patch) | |
| tree | e2955cdba1c7bd3b26b4b2de746a2c75f413d54d | |
| parent | 7bfe1e9cb0a63ecaa13ef59a37e65698ba3121d8 (diff) | |
sd-network: move sd-network API into libsystemd proper
In contrast to the DHCP/IPv4LL/ICMP6 APIs sd-network is not a protocol
implementation but a client API for networkd, hence move it into
libsystemd proper.
| -rw-r--r-- | Makefile.am | 14 | ||||
| l--------- | src/libsystemd/sd-network/Makefile | 1 | ||||
| -rw-r--r-- | src/libsystemd/sd-network/network-util.h (renamed from src/network/network-util.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-network/sd-network.c (renamed from src/network/sd-network.c) | 0 |
4 files changed, 8 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 2d00fcec46..bb218d2d82 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2381,6 +2381,7 @@ libsystemd_internal_la_SOURCES = \ src/systemd/sd-id128.h \ src/systemd/sd-daemon.h \ src/systemd/sd-path.h \ + src/systemd/sd-network.h \ src/libsystemd/sd-bus/sd-bus.c \ src/libsystemd/sd-bus/bus-control.c \ src/libsystemd/sd-bus/bus-control.h \ @@ -2437,7 +2438,9 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-id128/sd-id128.c \ src/libsystemd/sd-daemon/sd-daemon.c \ src/libsystemd/sd-login/sd-login.c \ - src/libsystemd/sd-path/sd-path.c + src/libsystemd/sd-path/sd-path.c \ + src/libsystemd/sd-network/sd-network.c \ + src/libsystemd/sd-network/network-util.h nodist_libsystemd_internal_la_SOURCES = \ src/libsystemd/libsystemd.sym \ @@ -2788,13 +2791,13 @@ libsystemd_network_la_CFLAGS = \ $(KMOD_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/systemd/sd-icmp6-nd.h \ + src/systemd/sd-dhcp6-client.h \ + src/systemd/sd-dhcp6-lease.h \ src/libsystemd-network/sd-dhcp-client.c \ src/libsystemd-network/sd-dhcp-server.c \ src/libsystemd-network/dhcp-network.c \ @@ -2811,9 +2814,6 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/ipv4ll-internal.h \ src/libsystemd-network/network-internal.c \ src/libsystemd-network/network-internal.h \ - src/systemd/sd-icmp6-nd.h \ - src/systemd/sd-dhcp6-client.h \ - src/systemd/sd-dhcp6-lease.h \ src/libsystemd-network/sd-icmp6-nd.c \ src/libsystemd-network/sd-dhcp6-client.c \ src/libsystemd-network/dhcp6-internal.h \ diff --git a/src/libsystemd/sd-network/Makefile b/src/libsystemd/sd-network/Makefile new file mode 120000 index 0000000000..d0b0e8e008 --- /dev/null +++ b/src/libsystemd/sd-network/Makefile @@ -0,0 +1 @@ +../Makefile
\ No newline at end of file diff --git a/src/network/network-util.h b/src/libsystemd/sd-network/network-util.h index 139efc7677..139efc7677 100644 --- a/src/network/network-util.h +++ b/src/libsystemd/sd-network/network-util.h diff --git a/src/network/sd-network.c b/src/libsystemd/sd-network/sd-network.c index 6375788c95..6375788c95 100644 --- a/src/network/sd-network.c +++ b/src/libsystemd/sd-network/sd-network.c |