libsystemd-rtnl: merge into libsystemd

diff --git a/Makefile.am b/Makefile.am
index 0d7ffc667a13defa93df714ea6bee16464bcd7d2..a73a66d4a4c5037d7d9a05ac5be4efa380fb71c1 100644 (file)
--- 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)
@@ -640,31 +639,6 @@ EXTRA_DIST += \
        make-directive-index.py \
        xml_helper.py
 
-# ------------------------------------------------------------------------------
-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
@@ -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 (symlink)
index d0b0e8e..0000000
--- 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
similarity index 100%
rename from src/libsystemd-rtnl/rtnl-internal.h
rename to src/libsystemd/rtnl-internal.h

diff --git a/src/libsystemd-rtnl/rtnl-message.c b/src/libsystemd/rtnl-message.c
similarity index 100%
rename from src/libsystemd-rtnl/rtnl-message.c
rename to src/libsystemd/rtnl-message.c

diff --git a/src/libsystemd-rtnl/rtnl-util.c b/src/libsystemd/rtnl-util.c
similarity index 100%
rename from src/libsystemd-rtnl/rtnl-util.c
rename to src/libsystemd/rtnl-util.c

diff --git a/src/libsystemd-rtnl/rtnl-util.h b/src/libsystemd/rtnl-util.h
similarity index 100%
rename from src/libsystemd-rtnl/rtnl-util.h
rename to src/libsystemd/rtnl-util.h

diff --git a/src/libsystemd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl.c
similarity index 100%
rename from src/libsystemd-rtnl/sd-rtnl.c
rename to src/libsystemd/sd-rtnl.c

diff --git a/src/libsystemd-rtnl/test-rtnl.c b/src/libsystemd/test-rtnl.c
similarity index 100%
rename from src/libsystemd-rtnl/test-rtnl.c
rename to src/libsystemd/test-rtnl.c