From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 12 Aug 2014 00:12:05 +0000 (+0200)
Subject: sd-network: move sd-network API into libsystemd proper
X-Git-Tag: v216~192
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a903fd34c0e30b82f4264ea25553535edefdee08

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.
---

diff --git a/Makefile.am b/Makefile.am
index 2d00fcec4..bb218d2d8 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 000000000..d0b0e8e00
--- /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
similarity index 100%
rename from src/network/network-util.h
rename to src/libsystemd/sd-network/network-util.h
diff --git a/src/network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
similarity index 100%
rename from src/network/sd-network.c
rename to src/libsystemd/sd-network/sd-network.c