diff options
| -rw-r--r-- | Makefile.am | 74 | ||||
| l--------- | src/libsystemd-dhcp/Makefile | 1 | ||||
| -rw-r--r-- | src/libsystemd-dhcp/dhcp-internal.h (renamed from src/libsystemd/dhcp-internal.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd-dhcp/dhcp-network.c (renamed from src/libsystemd/dhcp-network.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd-dhcp/dhcp-option.c (renamed from src/libsystemd/dhcp-option.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd-dhcp/dhcp-protocol.h (renamed from src/libsystemd/dhcp-protocol.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd-dhcp/sd-dhcp-client.c (renamed from src/libsystemd/sd-dhcp-client.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd-dhcp/test-dhcp-client.c (renamed from src/libsystemd/test-dhcp-client.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd-dhcp/test-dhcp-option.c (renamed from src/libsystemd/test-dhcp-option.c) | 0 |
9 files changed, 46 insertions, 29 deletions
diff --git a/Makefile.am b/Makefile.am index e6f411cfec..8a897cddd4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1982,7 +1982,6 @@ 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/systemd/sd-rtnl.h \ src/systemd/sd-resolve.h \ src/libsystemd/sd-bus.c \ @@ -2025,11 +2024,6 @@ libsystemd_la_SOURCES = \ src/libsystemd/sd-event.c \ src/libsystemd/event-util.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 \ src/libsystemd/sd-rtnl.c \ src/libsystemd/rtnl-internal.h \ src/libsystemd/rtnl-message.c \ @@ -2112,8 +2106,6 @@ tests += \ test-bus-creds \ test-bus-gvariant \ test-event \ - test-dhcp-option \ - test-dhcp-client \ test-rtnl \ test-resolve @@ -2319,27 +2311,6 @@ 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 - test_rtnl_SOURCES = \ src/libsystemd/test-rtnl.c @@ -2378,6 +2349,49 @@ busctl_CFLAGS = \ $(CAP_CFLAGS) # ------------------------------------------------------------------------------ +noinst_LTLIBRARIES += \ + libsystemd-dhcp.la + +libsystemd_dhcp_la_SOURCES = \ + src/systemd/sd-dhcp-client.h \ + src/libsystemd-dhcp/sd-dhcp-client.c \ + src/libsystemd-dhcp/dhcp-network.c \ + src/libsystemd-dhcp/dhcp-option.c \ + src/libsystemd-dhcp/dhcp-internal.h \ + src/libsystemd-dhcp/dhcp-protocol.h + +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-internal.la \ + libsystemd-shared.la + +test_dhcp_client_SOURCES = \ + src/systemd/sd-dhcp-client.h \ + src/libsystemd-dhcp/dhcp-protocol.h \ + src/libsystemd-dhcp/dhcp-internal.h \ + src/libsystemd-dhcp/test-dhcp-client.c + +test_dhcp_client_LDADD = \ + libsystemd-dhcp.la \ + libsystemd-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-shared.la + +tests += \ + test-dhcp-option \ + test-dhcp-client + +# ------------------------------------------------------------------------------ if ENABLE_GTK_DOC SUBDIRS += \ docs/libudev @@ -4079,6 +4093,7 @@ systemd_networkd_LDADD = \ libudev-internal.la \ libsystemd-daemon-internal.la \ libsystemd-internal.la \ + libsystemd-dhcp.la \ libsystemd-id128-internal.la \ libsystemd-label.la \ libsystemd-shared.la @@ -4103,6 +4118,7 @@ test_network_SOURCES = \ test_network_LDADD = \ libudev-internal.la \ libsystemd-internal.la \ + libsystemd-dhcp.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-label.la \ diff --git a/src/libsystemd-dhcp/Makefile b/src/libsystemd-dhcp/Makefile new file mode 120000 index 0000000000..d0b0e8e008 --- /dev/null +++ b/src/libsystemd-dhcp/Makefile @@ -0,0 +1 @@ +../Makefile
\ No newline at end of file diff --git a/src/libsystemd/dhcp-internal.h b/src/libsystemd-dhcp/dhcp-internal.h index 43b5b1d000..43b5b1d000 100644 --- a/src/libsystemd/dhcp-internal.h +++ b/src/libsystemd-dhcp/dhcp-internal.h diff --git a/src/libsystemd/dhcp-network.c b/src/libsystemd-dhcp/dhcp-network.c index b2de67e8a7..b2de67e8a7 100644 --- a/src/libsystemd/dhcp-network.c +++ b/src/libsystemd-dhcp/dhcp-network.c diff --git a/src/libsystemd/dhcp-option.c b/src/libsystemd-dhcp/dhcp-option.c index 4d45b3b3a4..4d45b3b3a4 100644 --- a/src/libsystemd/dhcp-option.c +++ b/src/libsystemd-dhcp/dhcp-option.c diff --git a/src/libsystemd/dhcp-protocol.h b/src/libsystemd-dhcp/dhcp-protocol.h index abdfe8d54b..abdfe8d54b 100644 --- a/src/libsystemd/dhcp-protocol.h +++ b/src/libsystemd-dhcp/dhcp-protocol.h diff --git a/src/libsystemd/sd-dhcp-client.c b/src/libsystemd-dhcp/sd-dhcp-client.c index 3b7b9f4ccd..3b7b9f4ccd 100644 --- a/src/libsystemd/sd-dhcp-client.c +++ b/src/libsystemd-dhcp/sd-dhcp-client.c diff --git a/src/libsystemd/test-dhcp-client.c b/src/libsystemd-dhcp/test-dhcp-client.c index 56a10b3dfc..56a10b3dfc 100644 --- a/src/libsystemd/test-dhcp-client.c +++ b/src/libsystemd-dhcp/test-dhcp-client.c diff --git a/src/libsystemd/test-dhcp-option.c b/src/libsystemd-dhcp/test-dhcp-option.c index ac0b0a435a..ac0b0a435a 100644 --- a/src/libsystemd/test-dhcp-option.c +++ b/src/libsystemd-dhcp/test-dhcp-option.c |