libsystemd: split up into subdirs

We still only produce on .so, but let's keep the sources separate to make things a bit
less messy.

diff --git a/Makefile.am b/Makefile.am
index 8a897cddd444d2e94f99f0f8812be13675d6a660..935a1955ac50f6a72df5ca2059530614a7271317 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -189,7 +189,9 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/udev \
        -I $(top_srcdir)/src/udev/net \
        -I $(top_builddir)/src/udev \
-       -I $(top_srcdir)/src/libsystemd \
+       -I $(top_srcdir)/src/libsystemd/sd-bus \
+       -I $(top_srcdir)/src/libsystemd/sd-event \
+       -I $(top_srcdir)/src/libsystemd/sd-rtnl \
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -1984,56 +1986,56 @@ libsystemd_la_SOURCES = \
        src/systemd/sd-event.h \
        src/systemd/sd-rtnl.h \
        src/systemd/sd-resolve.h \
-       src/libsystemd/sd-bus.c \
-       src/libsystemd/bus-control.c \
-       src/libsystemd/bus-control.h \
-       src/libsystemd/bus-error.c \
-       src/libsystemd/bus-error.h \
-       src/libsystemd/bus-internal.c \
-       src/libsystemd/bus-internal.h \
-       src/libsystemd/bus-socket.c \
-       src/libsystemd/bus-socket.h \
-       src/libsystemd/bus-kernel.c \
-       src/libsystemd/bus-kernel.h \
-       src/libsystemd/bus-container.c \
-       src/libsystemd/bus-container.h \
-       src/libsystemd/bus-message.c \
-       src/libsystemd/bus-message.h \
-       src/libsystemd/bus-creds.c \
-       src/libsystemd/bus-creds.h \
-       src/libsystemd/bus-signature.c \
-       src/libsystemd/bus-signature.h \
-       src/libsystemd/bus-type.c \
-       src/libsystemd/bus-type.h \
-       src/libsystemd/bus-match.c \
-       src/libsystemd/bus-match.h \
-       src/libsystemd/bus-bloom.c \
-       src/libsystemd/bus-bloom.h \
-       src/libsystemd/bus-introspect.c \
-       src/libsystemd/bus-introspect.h \
-       src/libsystemd/bus-objects.c \
-       src/libsystemd/bus-objects.h \
-       src/libsystemd/bus-gvariant.c \
-       src/libsystemd/bus-gvariant.h \
-       src/libsystemd/bus-convenience.c \
-       src/libsystemd/kdbus.h \
-       src/libsystemd/sd-memfd.c \
-       src/libsystemd/bus-util.c \
-       src/libsystemd/bus-util.h \
-       src/libsystemd/sd-utf8.c \
-       src/libsystemd/sd-event.c \
-       src/libsystemd/event-util.h \
-       src/libsystemd/bus-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 \
-       src/libsystemd/sd-resolve.c \
-       src/libsystemd/resolve-util.h
+       src/libsystemd/sd-bus/sd-bus.c \
+       src/libsystemd/sd-bus/bus-control.c \
+       src/libsystemd/sd-bus/bus-control.h \
+       src/libsystemd/sd-bus/bus-error.c \
+       src/libsystemd/sd-bus/bus-error.h \
+       src/libsystemd/sd-bus/bus-internal.c \
+       src/libsystemd/sd-bus/bus-internal.h \
+       src/libsystemd/sd-bus/bus-socket.c \
+       src/libsystemd/sd-bus/bus-socket.h \
+       src/libsystemd/sd-bus/bus-kernel.c \
+       src/libsystemd/sd-bus/bus-kernel.h \
+       src/libsystemd/sd-bus/bus-container.c \
+       src/libsystemd/sd-bus/bus-container.h \
+       src/libsystemd/sd-bus/bus-message.c \
+       src/libsystemd/sd-bus/bus-message.h \
+       src/libsystemd/sd-bus/bus-creds.c \
+       src/libsystemd/sd-bus/bus-creds.h \
+       src/libsystemd/sd-bus/bus-signature.c \
+       src/libsystemd/sd-bus/bus-signature.h \
+       src/libsystemd/sd-bus/bus-type.c \
+       src/libsystemd/sd-bus/bus-type.h \
+       src/libsystemd/sd-bus/bus-match.c \
+       src/libsystemd/sd-bus/bus-match.h \
+       src/libsystemd/sd-bus/bus-bloom.c \
+       src/libsystemd/sd-bus/bus-bloom.h \
+       src/libsystemd/sd-bus/bus-introspect.c \
+       src/libsystemd/sd-bus/bus-introspect.h \
+       src/libsystemd/sd-bus/bus-objects.c \
+       src/libsystemd/sd-bus/bus-objects.h \
+       src/libsystemd/sd-bus/bus-gvariant.c \
+       src/libsystemd/sd-bus/bus-gvariant.h \
+       src/libsystemd/sd-bus/bus-convenience.c \
+       src/libsystemd/sd-bus/bus-util.c \
+       src/libsystemd/sd-bus/bus-util.h \
+       src/libsystemd/sd-bus/bus-protocol.h \
+       src/libsystemd/sd-bus/kdbus.h \
+       src/libsystemd/sd-bus/sd-memfd.c \
+       src/libsystemd/sd-utf8/sd-utf8.c \
+       src/libsystemd/sd-event/sd-event.c \
+       src/libsystemd/sd-event/event-util.h \
+       src/libsystemd/sd-rtnl/sd-rtnl.c \
+       src/libsystemd/sd-rtnl/rtnl-internal.h \
+       src/libsystemd/sd-rtnl/rtnl-message.c \
+       src/libsystemd/sd-rtnl/rtnl-util.h \
+       src/libsystemd/sd-rtnl/rtnl-util.c \
+       src/libsystemd/sd-resolve/sd-resolve.c \
+       src/libsystemd/sd-resolve/resolve-util.h
 
 nodist_libsystemd_la_SOURCES = \
-       src/libsystemd/bus-error-mapping.c
+       src/libsystemd/sd-bus/bus-error-mapping.c
 
 libsystemd_la_LIBADD = \
        libsystemd-id128-internal.la \
@@ -2054,13 +2056,13 @@ pkgconfiglib_DATA += \
        src/libsystemd/libsystemd.pc
 
 EXTRA_DIST += \
-       src/libsystemd/bus-error-mapping.gperf \
-       src/libsystemd/libsystemd.pc.in \
-       src/libsystemd/DIFFERENCES \
-       src/libsystemd/GVARIANT-SERIALIZATION
+       src/libsystemd/sd-bus/bus-error-mapping.gperf \
+       src/libsystemd/sd-bus/DIFFERENCES \
+       src/libsystemd/sd-bus/GVARIANT-SERIALIZATION \
+       src/libsystemd/libsystemd.pc.in
 
 CLEANFILES += \
-       src/libsystemd/bus-error-mapping.c
+       src/libsystemd/sd-bus/bus-error-mapping.c
 
 lib_LTLIBRARIES += \
        libsystemd.la
@@ -2078,8 +2080,8 @@ noinst_LTLIBRARIES += \
        libsystemd-internal.la
 
 libsystemd_dump_la_SOURCES = \
-       src/libsystemd/bus-dump.c \
-       src/libsystemd/bus-dump.h
+       src/libsystemd/sd-bus/bus-dump.c \
+       src/libsystemd/sd-bus/bus-dump.h
 
 libsystemd_dump_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2113,7 +2115,7 @@ bin_PROGRAMS += \
        busctl
 
 test_bus_marshal_SOURCES = \
-       src/libsystemd/test-bus-marshal.c
+       src/libsystemd/sd-bus/test-bus-marshal.c
 
 test_bus_marshal_LDADD = \
        libsystemd-internal.la \
@@ -2133,14 +2135,14 @@ test_bus_marshal_CFLAGS = \
        $(CAP_CFLAGS)
 
 test_bus_signature_SOURCES = \
-       src/libsystemd/test-bus-signature.c
+       src/libsystemd/sd-bus/test-bus-signature.c
 
 test_bus_signature_LDADD = \
        libsystemd-shared.la \
        libsystemd-internal.la
 
 test_bus_chat_SOURCES = \
-       src/libsystemd/test-bus-chat.c
+       src/libsystemd/sd-bus/test-bus-chat.c
 
 test_bus_chat_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2153,7 +2155,7 @@ test_bus_chat_LDADD = \
        libsystemd-shared.la
 
 test_bus_cleanup_SOURCES = \
-       src/libsystemd/test-bus-cleanup.c
+       src/libsystemd/sd-bus/test-bus-cleanup.c
 
 test_bus_cleanup_LDADD = \
        libsystemd-internal.la \
@@ -2162,7 +2164,7 @@ test_bus_cleanup_LDADD = \
        libsystemd-shared.la
 
 test_bus_server_SOURCES = \
-       src/libsystemd/test-bus-server.c
+       src/libsystemd/sd-bus/test-bus-server.c
 
 test_bus_server_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2175,7 +2177,7 @@ test_bus_server_LDADD = \
        libsystemd-shared.la
 
 test_bus_objects_SOURCES = \
-       src/libsystemd/test-bus-objects.c
+       src/libsystemd/sd-bus/test-bus-objects.c
 
 test_bus_objects_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2192,7 +2194,7 @@ test_bus_objects_LDADD = \
        $(CAP_LIBS)
 
 test_bus_error_SOURCES = \
-       src/libsystemd/test-bus-error.c
+       src/libsystemd/sd-bus/test-bus-error.c
 
 test_bus_error_LDADD = \
        libsystemd-internal.la \
@@ -2201,7 +2203,7 @@ test_bus_error_LDADD = \
        libsystemd-shared.la
 
 test_bus_gvariant_SOURCES = \
-       src/libsystemd/test-bus-gvariant.c
+       src/libsystemd/sd-bus/test-bus-gvariant.c
 
 test_bus_gvariant_LDADD = \
        libsystemd-internal.la \
@@ -2219,7 +2221,7 @@ test_bus_gvariant_CFLAGS = \
        $(CAP_CFLAGS)
 
 test_bus_creds_SOURCES = \
-       src/libsystemd/test-bus-creds.c
+       src/libsystemd/sd-bus/test-bus-creds.c
 
 test_bus_creds_LDADD = \
        libsystemd-internal.la \
@@ -2230,7 +2232,7 @@ test_bus_creds_LDADD = \
        libsystemd-capability.la
 
 test_bus_match_SOURCES = \
-       src/libsystemd/test-bus-match.c
+       src/libsystemd/sd-bus/test-bus-match.c
 
 test_bus_match_LDADD = \
        libsystemd-internal.la \
@@ -2239,7 +2241,7 @@ test_bus_match_LDADD = \
        libsystemd-shared.la
 
 test_bus_kernel_SOURCES = \
-       src/libsystemd/test-bus-kernel.c
+       src/libsystemd/sd-bus/test-bus-kernel.c
 
 test_bus_kernel_LDADD = \
        libsystemd-internal.la \
@@ -2255,7 +2257,7 @@ test_bus_kernel_CFLAGS = \
        $(CAP_CFLAGS)
 
 test_bus_kernel_bloom_SOURCES = \
-       src/libsystemd/test-bus-kernel-bloom.c
+       src/libsystemd/sd-bus/test-bus-kernel-bloom.c
 
 test_bus_kernel_bloom_LDADD = \
        libsystemd-internal.la \
@@ -2264,7 +2266,7 @@ test_bus_kernel_bloom_LDADD = \
        libsystemd-shared.la
 
 test_bus_kernel_benchmark_SOURCES = \
-       src/libsystemd/test-bus-kernel-benchmark.c
+       src/libsystemd/sd-bus/test-bus-kernel-benchmark.c
 
 test_bus_kernel_benchmark_LDADD = \
        libsystemd-internal.la \
@@ -2273,14 +2275,14 @@ test_bus_kernel_benchmark_LDADD = \
        libsystemd-shared.la
 
 test_bus_memfd_SOURCES = \
-       src/libsystemd/test-bus-memfd.c
+       src/libsystemd/sd-bus/test-bus-memfd.c
 
 test_bus_memfd_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
 test_bus_zero_copy_SOURCES = \
-       src/libsystemd/test-bus-zero-copy.c
+       src/libsystemd/sd-bus/test-bus-zero-copy.c
 
 test_bus_zero_copy_LDADD = \
        libsystemd-internal.la \
@@ -2296,14 +2298,14 @@ test_bus_zero_copy_CFLAGS = \
        $(CAP_CFLAGS)
 
 test_bus_introspect_SOURCES = \
-       src/libsystemd/test-bus-introspect.c
+       src/libsystemd/sd-bus/test-bus-introspect.c
 
 test_bus_introspect_LDADD = \
        libsystemd-shared.la \
        libsystemd-internal.la
 
 test_event_SOURCES = \
-       src/libsystemd/test-event.c
+       src/libsystemd/sd-event/test-event.c
 
 test_event_LDADD = \
        libsystemd-internal.la \
@@ -2312,7 +2314,7 @@ test_event_LDADD = \
        libsystemd-shared.la
 
 test_rtnl_SOURCES = \
-       src/libsystemd/test-rtnl.c
+       src/libsystemd/sd-rtnl/test-rtnl.c
 
 test_rtnl_LDADD = \
        libsystemd-internal.la \
@@ -2322,7 +2324,7 @@ test_rtnl_LDADD = \
 
 test_resolve_SOURCES = \
        src/systemd/sd-resolve.h \
-       src/libsystemd/test-resolve.c
+       src/libsystemd/sd-resolve/test-resolve.c
 
 test_resolve_LDADD = \
        libsystemd-internal.la \
@@ -2333,7 +2335,7 @@ test_resolve_CFLAGS = \
        -pthread
 
 busctl_SOURCES = \
-       src/libsystemd/busctl.c
+       src/libsystemd/sd-bus/busctl.c
 
 busctl_LDADD = \
        libsystemd-internal.la \

diff --git a/src/libsystemd/.gitignore b/src/libsystemd/.gitignore
index 613b05c8733326915e1cfe25516643871ece949d..50a169237457e7c08ce1da9907cfb4fe58a704ed 100644 (file)
--- a/src/libsystemd/.gitignore
+++ b/src/libsystemd/.gitignore
@@ -1,2 +1 @@
 /libsystemd.pc
-/bus-error-mapping.c

diff --git a/src/libsystemd/sd-bus/.gitignore b/src/libsystemd/sd-bus/.gitignore
new file mode 100644 (file)
index 0000000..d32542e
--- /dev/null
+++ b/src/libsystemd/sd-bus/.gitignore
@@ -0,0 +1 @@
+/bus-error-mapping.c

diff --git a/src/libsystemd/DIFFERENCES b/src/libsystemd/sd-bus/DIFFERENCES
similarity index 100%
rename from src/libsystemd/DIFFERENCES
rename to src/libsystemd/sd-bus/DIFFERENCES

diff --git a/src/libsystemd/GVARIANT-SERIALIZATION b/src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
similarity index 100%
rename from src/libsystemd/GVARIANT-SERIALIZATION
rename to src/libsystemd/sd-bus/GVARIANT-SERIALIZATION

diff --git a/src/libsystemd/sd-bus/Makefile b/src/libsystemd/sd-bus/Makefile
new file mode 120000 (symlink)
index 0000000..94aaae2
--- /dev/null
+++ b/src/libsystemd/sd-bus/Makefile
@@ -0,0 +1 @@
+../../Makefile
\ No newline at end of file

diff --git a/src/libsystemd/PORTING-DBUS1 b/src/libsystemd/sd-bus/PORTING-DBUS1
similarity index 100%
rename from src/libsystemd/PORTING-DBUS1
rename to src/libsystemd/sd-bus/PORTING-DBUS1

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

diff --git a/src/libsystemd/bus-bloom.h b/src/libsystemd/sd-bus/bus-bloom.h
similarity index 100%
rename from src/libsystemd/bus-bloom.h
rename to src/libsystemd/sd-bus/bus-bloom.h

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

diff --git a/src/libsystemd/bus-container.h b/src/libsystemd/sd-bus/bus-container.h
similarity index 100%
rename from src/libsystemd/bus-container.h
rename to src/libsystemd/sd-bus/bus-container.h

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

diff --git a/src/libsystemd/bus-control.h b/src/libsystemd/sd-bus/bus-control.h
similarity index 100%
rename from src/libsystemd/bus-control.h
rename to src/libsystemd/sd-bus/bus-control.h

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

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

diff --git a/src/libsystemd/bus-creds.h b/src/libsystemd/sd-bus/bus-creds.h
similarity index 100%
rename from src/libsystemd/bus-creds.h
rename to src/libsystemd/sd-bus/bus-creds.h

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

diff --git a/src/libsystemd/bus-dump.h b/src/libsystemd/sd-bus/bus-dump.h
similarity index 100%
rename from src/libsystemd/bus-dump.h
rename to src/libsystemd/sd-bus/bus-dump.h

diff --git a/src/libsystemd/bus-error-mapping.gperf b/src/libsystemd/sd-bus/bus-error-mapping.gperf
similarity index 100%
rename from src/libsystemd/bus-error-mapping.gperf
rename to src/libsystemd/sd-bus/bus-error-mapping.gperf

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

diff --git a/src/libsystemd/bus-error.h b/src/libsystemd/sd-bus/bus-error.h
similarity index 100%
rename from src/libsystemd/bus-error.h
rename to src/libsystemd/sd-bus/bus-error.h

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

diff --git a/src/libsystemd/bus-gvariant.h b/src/libsystemd/sd-bus/bus-gvariant.h
similarity index 100%
rename from src/libsystemd/bus-gvariant.h
rename to src/libsystemd/sd-bus/bus-gvariant.h

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

diff --git a/src/libsystemd/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
similarity index 100%
rename from src/libsystemd/bus-internal.h
rename to src/libsystemd/sd-bus/bus-internal.h

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

diff --git a/src/libsystemd/bus-introspect.h b/src/libsystemd/sd-bus/bus-introspect.h
similarity index 100%
rename from src/libsystemd/bus-introspect.h
rename to src/libsystemd/sd-bus/bus-introspect.h

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

diff --git a/src/libsystemd/bus-kernel.h b/src/libsystemd/sd-bus/bus-kernel.h
similarity index 100%
rename from src/libsystemd/bus-kernel.h
rename to src/libsystemd/sd-bus/bus-kernel.h

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

diff --git a/src/libsystemd/bus-match.h b/src/libsystemd/sd-bus/bus-match.h
similarity index 100%
rename from src/libsystemd/bus-match.h
rename to src/libsystemd/sd-bus/bus-match.h

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

diff --git a/src/libsystemd/bus-message.h b/src/libsystemd/sd-bus/bus-message.h
similarity index 100%
rename from src/libsystemd/bus-message.h
rename to src/libsystemd/sd-bus/bus-message.h

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

diff --git a/src/libsystemd/bus-objects.h b/src/libsystemd/sd-bus/bus-objects.h
similarity index 100%
rename from src/libsystemd/bus-objects.h
rename to src/libsystemd/sd-bus/bus-objects.h

diff --git a/src/libsystemd/bus-protocol.h b/src/libsystemd/sd-bus/bus-protocol.h
similarity index 100%
rename from src/libsystemd/bus-protocol.h
rename to src/libsystemd/sd-bus/bus-protocol.h

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

diff --git a/src/libsystemd/bus-signature.h b/src/libsystemd/sd-bus/bus-signature.h
similarity index 100%
rename from src/libsystemd/bus-signature.h
rename to src/libsystemd/sd-bus/bus-signature.h

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

diff --git a/src/libsystemd/bus-socket.h b/src/libsystemd/sd-bus/bus-socket.h
similarity index 100%
rename from src/libsystemd/bus-socket.h
rename to src/libsystemd/sd-bus/bus-socket.h

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

diff --git a/src/libsystemd/bus-type.h b/src/libsystemd/sd-bus/bus-type.h
similarity index 100%
rename from src/libsystemd/bus-type.h
rename to src/libsystemd/sd-bus/bus-type.h

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

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

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

diff --git a/src/libsystemd/kdbus.h b/src/libsystemd/sd-bus/kdbus.h
similarity index 100%
rename from src/libsystemd/kdbus.h
rename to src/libsystemd/sd-bus/kdbus.h

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

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

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

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

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

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

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

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

diff --git a/src/libsystemd/test-bus-kernel-benchmark.c b/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c
similarity index 100%
rename from src/libsystemd/test-bus-kernel-benchmark.c
rename to src/libsystemd/sd-bus/test-bus-kernel-benchmark.c

diff --git a/src/libsystemd/test-bus-kernel-bloom.c b/src/libsystemd/sd-bus/test-bus-kernel-bloom.c
similarity index 100%
rename from src/libsystemd/test-bus-kernel-bloom.c
rename to src/libsystemd/sd-bus/test-bus-kernel-bloom.c

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

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

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

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

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

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

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

diff --git a/src/libsystemd/test-bus-zero-copy.c b/src/libsystemd/sd-bus/test-bus-zero-copy.c
similarity index 100%
rename from src/libsystemd/test-bus-zero-copy.c
rename to src/libsystemd/sd-bus/test-bus-zero-copy.c

diff --git a/src/libsystemd/sd-event/Makefile b/src/libsystemd/sd-event/Makefile
new file mode 120000 (symlink)
index 0000000..94aaae2
--- /dev/null
+++ b/src/libsystemd/sd-event/Makefile
@@ -0,0 +1 @@
+../../Makefile
\ No newline at end of file

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

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

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

diff --git a/src/libsystemd/sd-resolve/Makefile b/src/libsystemd/sd-resolve/Makefile
new file mode 120000 (symlink)
index 0000000..94aaae2
--- /dev/null
+++ b/src/libsystemd/sd-resolve/Makefile
@@ -0,0 +1 @@
+../../Makefile
\ No newline at end of file

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

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

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

diff --git a/src/libsystemd/sd-rtnl/Makefile b/src/libsystemd/sd-rtnl/Makefile
new file mode 120000 (symlink)
index 0000000..94aaae2
--- /dev/null
+++ b/src/libsystemd/sd-rtnl/Makefile
@@ -0,0 +1 @@
+../../Makefile
\ No newline at end of file

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

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

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

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

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

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

diff --git a/src/libsystemd/sd-utf8/Makefile b/src/libsystemd/sd-utf8/Makefile
new file mode 120000 (symlink)
index 0000000..94aaae2
--- /dev/null
+++ b/src/libsystemd/sd-utf8/Makefile
@@ -0,0 +1 @@
+../../Makefile
\ No newline at end of file

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