From: Tom Gundersen <teg@jklm.no>
Date: Mon, 13 Jan 2014 18:12:16 +0000 (+0100)
Subject: libsystemd-dhcp: merge into libsystemd
X-Git-Tag: v209~445
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c813ca40c859ff8abc8bc6aabc3f1e896623eb67;p=elogind.git

libsystemd-dhcp: merge into libsystemd
---

diff --git a/Makefile.am b/Makefile.am
index 9fdc35a38..0d7ffc667 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2037,6 +2037,7 @@ libsystemd_la_SOURCES = \
 	src/systemd/sd-memfd.h \
 	src/systemd/sd-utf8.h \
 	src/systemd/sd-event.h \
+	src/systemd/sd-dhcp-client.h \
 	src/libsystemd/sd-bus.c \
 	src/libsystemd/bus-control.c \
 	src/libsystemd/bus-control.h \
@@ -2076,7 +2077,12 @@ libsystemd_la_SOURCES = \
 	src/libsystemd/sd-utf8.c \
 	src/libsystemd/sd-event.c \
 	src/libsystemd/event-util.h \
-	src/libsystemd/bus-protocol.h
+	src/libsystemd/bus-protocol.h \
+	src/libsystemd/sd-dhcp-client.c \
+	src/libsystemd/dhcp-network.c \
+	src/libsystemd/dhcp-option.c \
+	src/libsystemd/dhcp-internal.h \
+	src/libsystemd/dhcp-protocol.h
 
 nodist_libsystemd_la_SOURCES = \
 	src/libsystemd/bus-error-mapping.c
@@ -2149,7 +2155,9 @@ tests += \
 	test-bus-error \
 	test-bus-creds \
 	test-bus-gvariant \
-	test-event
+	test-event \
+	test-dhcp-option \
+	test-dhcp-client
 
 bin_PROGRAMS += \
 	busctl
@@ -2344,6 +2352,27 @@ test_event_LDADD = \
 	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
+test_dhcp_option_SOURCES = \
+	src/libsystemd/dhcp-protocol.h \
+	src/libsystemd/dhcp-internal.h \
+	src/libsystemd/test-dhcp-option.c
+
+test_dhcp_option_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+test_dhcp_client_SOURCES = \
+	src/systemd/sd-dhcp-client.h \
+	src/libsystemd/dhcp-protocol.h \
+	src/libsystemd/dhcp-internal.h \
+	src/libsystemd/test-dhcp-client.c
+
+test_dhcp_client_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-daemon-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-shared.la
+
 busctl_SOURCES = \
 	src/libsystemd/busctl.c
 
@@ -3963,48 +3992,6 @@ lib_LTLIBRARIES += \
 	libnss_myhostname.la
 endif
 
-# ------------------------------------------------------------------------------
-libsystemd_dhcp_la_SOURCES = \
-	src/systemd/sd-dhcp-client.h \
-	src/libsystemd-dhcp/dhcp-protocol.h \
-	src/libsystemd-dhcp/dhcp-internal.h \
-	src/libsystemd-dhcp/dhcp-network.c \
-	src/libsystemd-dhcp/dhcp-option.c \
-	src/libsystemd-dhcp/dhcp-client.c
-
-noinst_LTLIBRARIES += \
-	libsystemd-dhcp.la
-
-libsystemd_dhcp_la_LIBADD = \
-	libsystemd-internal.la \
-	libsystemd-shared.la
-
-test_dhcp_option_SOURCES = \
-	src/libsystemd-dhcp/dhcp-protocol.h \
-	src/libsystemd-dhcp/dhcp-internal.h \
-	src/libsystemd-dhcp/test-dhcp-option.c
-
-test_dhcp_option_LDADD = \
-	libsystemd-dhcp.la \
-	libsystemd-shared.la
-
-test_dhcp_client_SOURCES = \
-	src/libsystemd-dhcp/dhcp-protocol.h \
-	src/systemd/sd-dhcp-client.h \
-	src/libsystemd-dhcp/dhcp-internal.h \
-	src/libsystemd-dhcp/test-dhcp-client.c
-
-test_dhcp_client_LDADD = \
-	libsystemd-internal.la \
-	libsystemd-daemon-internal.la \
-	libsystemd-id128-internal.la \
-	libsystemd-dhcp.la \
-	libsystemd-shared.la
-
-tests += \
-	test-dhcp-option \
-	test-dhcp-client
-
 # ------------------------------------------------------------------------------
 if ENABLE_MACHINED
 systemd_machined_SOURCES = \
@@ -4106,7 +4093,6 @@ systemd_networkd_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-id128-internal.la \
 	libsystemd-rtnl.la \
-	libsystemd-dhcp.la \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
@@ -4133,7 +4119,6 @@ test_network_LDADD = \
 	libsystemd-id128-internal.la \
 	libsystemd-daemon-internal.la \
 	libsystemd-rtnl.la \
-	libsystemd-dhcp.la \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
diff --git a/src/libsystemd-dhcp/Makefile b/src/libsystemd-dhcp/Makefile
deleted file mode 120000
index d0b0e8e00..000000000
--- a/src/libsystemd-dhcp/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../Makefile
\ No newline at end of file
diff --git a/src/libsystemd-dhcp/dhcp-internal.h b/src/libsystemd/dhcp-internal.h
similarity index 100%
rename from src/libsystemd-dhcp/dhcp-internal.h
rename to src/libsystemd/dhcp-internal.h
diff --git a/src/libsystemd-dhcp/dhcp-network.c b/src/libsystemd/dhcp-network.c
similarity index 100%
rename from src/libsystemd-dhcp/dhcp-network.c
rename to src/libsystemd/dhcp-network.c
diff --git a/src/libsystemd-dhcp/dhcp-option.c b/src/libsystemd/dhcp-option.c
similarity index 100%
rename from src/libsystemd-dhcp/dhcp-option.c
rename to src/libsystemd/dhcp-option.c
diff --git a/src/libsystemd-dhcp/dhcp-protocol.h b/src/libsystemd/dhcp-protocol.h
similarity index 100%
rename from src/libsystemd-dhcp/dhcp-protocol.h
rename to src/libsystemd/dhcp-protocol.h
diff --git a/src/libsystemd-dhcp/dhcp-client.c b/src/libsystemd/sd-dhcp-client.c
similarity index 100%
rename from src/libsystemd-dhcp/dhcp-client.c
rename to src/libsystemd/sd-dhcp-client.c
diff --git a/src/libsystemd-dhcp/test-dhcp-client.c b/src/libsystemd/test-dhcp-client.c
similarity index 100%
rename from src/libsystemd-dhcp/test-dhcp-client.c
rename to src/libsystemd/test-dhcp-client.c
diff --git a/src/libsystemd-dhcp/test-dhcp-option.c b/src/libsystemd/test-dhcp-option.c
similarity index 100%
rename from src/libsystemd-dhcp/test-dhcp-option.c
rename to src/libsystemd/test-dhcp-option.c