libsystemd-dhcp: merge into libsystemd

9 files changed, 31 insertions, 47 deletions

diff --git a/Makefile.am b/Makefile.am
index 9fdc35a38a..0d7ffc667a 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
 
@@ -3964,48 +3993,6 @@ lib_LTLIBRARIES += \
 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 = \
 	src/machine/machined.c \
@@ -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 d0b0e8e008..0000000000
--- 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
index 43b5b1d000..43b5b1d000 100644
--- a/src/libsystemd-dhcp/dhcp-internal.h
+++ b/src/libsystemd/dhcp-internal.h
diff --git a/src/libsystemd-dhcp/dhcp-network.c b/src/libsystemd/dhcp-network.c
index b2de67e8a7..b2de67e8a7 100644
--- a/src/libsystemd-dhcp/dhcp-network.c
+++ b/src/libsystemd/dhcp-network.c
diff --git a/src/libsystemd-dhcp/dhcp-option.c b/src/libsystemd/dhcp-option.c
index 4d45b3b3a4..4d45b3b3a4 100644
--- a/src/libsystemd-dhcp/dhcp-option.c
+++ b/src/libsystemd/dhcp-option.c
diff --git a/src/libsystemd-dhcp/dhcp-protocol.h b/src/libsystemd/dhcp-protocol.h
index 76621f541b..76621f541b 100644
--- a/src/libsystemd-dhcp/dhcp-protocol.h
+++ b/src/libsystemd/dhcp-protocol.h
diff --git a/src/libsystemd-dhcp/dhcp-client.c b/src/libsystemd/sd-dhcp-client.c
index edfcb54a4c..edfcb54a4c 100644
--- a/src/libsystemd-dhcp/dhcp-client.c
+++ b/src/libsystemd/sd-dhcp-client.c
diff --git a/src/libsystemd-dhcp/test-dhcp-client.c b/src/libsystemd/test-dhcp-client.c
index 929b869ec3..929b869ec3 100644
--- a/src/libsystemd-dhcp/test-dhcp-client.c
+++ b/src/libsystemd/test-dhcp-client.c
diff --git a/src/libsystemd-dhcp/test-dhcp-option.c b/src/libsystemd/test-dhcp-option.c
index ac0b0a435a..ac0b0a435a 100644
--- a/src/libsystemd-dhcp/test-dhcp-option.c
+++ b/src/libsystemd/test-dhcp-option.c