summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am54
l---------src/libsystemd-rtnl/Makefile1
-rw-r--r--src/libsystemd/rtnl-internal.h (renamed from src/libsystemd-rtnl/rtnl-internal.h)0
-rw-r--r--src/libsystemd/rtnl-message.c (renamed from src/libsystemd-rtnl/rtnl-message.c)0
-rw-r--r--src/libsystemd/rtnl-util.c (renamed from src/libsystemd-rtnl/rtnl-util.c)0
-rw-r--r--src/libsystemd/rtnl-util.h (renamed from src/libsystemd-rtnl/rtnl-util.h)0
-rw-r--r--src/libsystemd/sd-rtnl.c (renamed from src/libsystemd-rtnl/sd-rtnl.c)0
-rw-r--r--src/libsystemd/test-rtnl.c (renamed from src/libsystemd-rtnl/test-rtnl.c)0
8 files changed, 20 insertions, 35 deletions
diff --git a/Makefile.am b/Makefile.am
index 0d7ffc667a..a73a66d4a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -190,7 +190,6 @@ AM_CPPFLAGS = \
-I $(top_srcdir)/src/udev/net \
-I $(top_builddir)/src/udev \
-I $(top_srcdir)/src/libsystemd \
- -I $(top_srcdir)/src/libsystemd-rtnl \
$(OUR_CPPFLAGS)
AM_CFLAGS = $(OUR_CFLAGS)
@@ -642,31 +641,6 @@ EXTRA_DIST += \
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
- libsystemd-rtnl.la
-
-libsystemd_rtnl_la_SOURCES = \
- src/systemd/sd-rtnl.h \
- src/libsystemd-rtnl/sd-rtnl.c \
- src/libsystemd-rtnl/rtnl-internal.h \
- src/libsystemd-rtnl/rtnl-message.c \
- src/libsystemd-rtnl/rtnl-util.h \
- src/libsystemd-rtnl/rtnl-util.c
-
-test_rtnl_SOURCES = \
- src/libsystemd-rtnl/test-rtnl.c
-
-test_rtnl_LDADD = \
- libsystemd-rtnl.la \
- libsystemd-internal.la \
- libsystemd-daemon-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-shared.la
-
-tests += \
- test-rtnl
-
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
libsystemd-dns.la
libsystemd_dns_la_SOURCES = \
@@ -1056,7 +1030,6 @@ libsystemd_core_la_LIBADD = \
libsystemd-daemon-internal.la \
libudev-internal.la \
libsystemd-shared.la \
- libsystemd-rtnl.la \
libsystemd-internal.la \
$(LIBWRAP_LIBS) \
$(PAM_LIBS) \
@@ -1921,8 +1894,7 @@ systemd_nspawn_LDADD = \
libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
- libsystemd-shared.la \
- libsystemd-rtnl.la
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
@@ -2038,6 +2010,7 @@ libsystemd_la_SOURCES = \
src/systemd/sd-utf8.h \
src/systemd/sd-event.h \
src/systemd/sd-dhcp-client.h \
+ src/systemd/sd-rtnl.h \
src/libsystemd/sd-bus.c \
src/libsystemd/bus-control.c \
src/libsystemd/bus-control.h \
@@ -2082,7 +2055,12 @@ libsystemd_la_SOURCES = \
src/libsystemd/dhcp-network.c \
src/libsystemd/dhcp-option.c \
src/libsystemd/dhcp-internal.h \
- src/libsystemd/dhcp-protocol.h
+ src/libsystemd/dhcp-protocol.h \
+ src/libsystemd/sd-rtnl.c \
+ src/libsystemd/rtnl-internal.h \
+ src/libsystemd/rtnl-message.c \
+ src/libsystemd/rtnl-util.h \
+ src/libsystemd/rtnl-util.c
nodist_libsystemd_la_SOURCES = \
src/libsystemd/bus-error-mapping.c
@@ -2157,7 +2135,8 @@ tests += \
test-bus-gvariant \
test-event \
test-dhcp-option \
- test-dhcp-client
+ test-dhcp-client \
+ test-rtnl
bin_PROGRAMS += \
busctl
@@ -2373,6 +2352,15 @@ test_dhcp_client_LDADD = \
libsystemd-id128-internal.la \
libsystemd-shared.la
+test_rtnl_SOURCES = \
+ src/libsystemd/test-rtnl.c
+
+test_rtnl_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-shared.la
+
busctl_SOURCES = \
src/libsystemd/busctl.c
@@ -2613,7 +2601,7 @@ libudev_core_la_LIBADD = \
libudev-internal.la \
libsystemd-label.la \
libsystemd-daemon-internal.la \
- libsystemd-rtnl.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-shared.la \
$(BLKID_LIBS) \
@@ -4092,7 +4080,6 @@ systemd_networkd_LDADD = \
libsystemd-daemon-internal.la \
libsystemd-internal.la \
libsystemd-id128-internal.la \
- libsystemd-rtnl.la \
libsystemd-label.la \
libsystemd-shared.la
@@ -4118,7 +4105,6 @@ test_network_LDADD = \
libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
- libsystemd-rtnl.la \
libsystemd-label.la \
libsystemd-shared.la
diff --git a/src/libsystemd-rtnl/Makefile b/src/libsystemd-rtnl/Makefile
deleted file mode 120000
index d0b0e8e008..0000000000
--- a/src/libsystemd-rtnl/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../Makefile \ No newline at end of file
diff --git a/src/libsystemd-rtnl/rtnl-internal.h b/src/libsystemd/rtnl-internal.h
index 2e0b7b8f37..2e0b7b8f37 100644
--- a/src/libsystemd-rtnl/rtnl-internal.h
+++ b/src/libsystemd/rtnl-internal.h
diff --git a/src/libsystemd-rtnl/rtnl-message.c b/src/libsystemd/rtnl-message.c
index 517df61156..517df61156 100644
--- a/src/libsystemd-rtnl/rtnl-message.c
+++ b/src/libsystemd/rtnl-message.c
diff --git a/src/libsystemd-rtnl/rtnl-util.c b/src/libsystemd/rtnl-util.c
index dfc0050def..dfc0050def 100644
--- a/src/libsystemd-rtnl/rtnl-util.c
+++ b/src/libsystemd/rtnl-util.c
diff --git a/src/libsystemd-rtnl/rtnl-util.h b/src/libsystemd/rtnl-util.h
index 013002dd60..013002dd60 100644
--- a/src/libsystemd-rtnl/rtnl-util.h
+++ b/src/libsystemd/rtnl-util.h
diff --git a/src/libsystemd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl.c
index 08b82ab2a9..08b82ab2a9 100644
--- a/src/libsystemd-rtnl/sd-rtnl.c
+++ b/src/libsystemd/sd-rtnl.c
diff --git a/src/libsystemd-rtnl/test-rtnl.c b/src/libsystemd/test-rtnl.c
index 58654e990a..58654e990a 100644
--- a/src/libsystemd-rtnl/test-rtnl.c
+++ b/src/libsystemd/test-rtnl.c