diff options
| -rw-r--r-- | Makefile.am | 154 | ||||
| -rw-r--r-- | src/libsystemd/.gitignore | 1 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/.gitignore | 1 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/DIFFERENCES (renamed from src/libsystemd/DIFFERENCES) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/GVARIANT-SERIALIZATION (renamed from src/libsystemd/GVARIANT-SERIALIZATION) | 0 | ||||
| l--------- | src/libsystemd/sd-bus/Makefile | 1 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/PORTING-DBUS1 (renamed from src/libsystemd/PORTING-DBUS1) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-bloom.c (renamed from src/libsystemd/bus-bloom.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-bloom.h (renamed from src/libsystemd/bus-bloom.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-container.c (renamed from src/libsystemd/bus-container.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-container.h (renamed from src/libsystemd/bus-container.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-control.c (renamed from src/libsystemd/bus-control.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-control.h (renamed from src/libsystemd/bus-control.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-convenience.c (renamed from src/libsystemd/bus-convenience.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-creds.c (renamed from src/libsystemd/bus-creds.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-creds.h (renamed from src/libsystemd/bus-creds.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-dump.c (renamed from src/libsystemd/bus-dump.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-dump.h (renamed from src/libsystemd/bus-dump.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-error-mapping.gperf (renamed from src/libsystemd/bus-error-mapping.gperf) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-error.c (renamed from src/libsystemd/bus-error.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-error.h (renamed from src/libsystemd/bus-error.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-gvariant.c (renamed from src/libsystemd/bus-gvariant.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-gvariant.h (renamed from src/libsystemd/bus-gvariant.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-internal.c (renamed from src/libsystemd/bus-internal.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-internal.h (renamed from src/libsystemd/bus-internal.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-introspect.c (renamed from src/libsystemd/bus-introspect.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-introspect.h (renamed from src/libsystemd/bus-introspect.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-kernel.c (renamed from src/libsystemd/bus-kernel.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-kernel.h (renamed from src/libsystemd/bus-kernel.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-match.c (renamed from src/libsystemd/bus-match.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-match.h (renamed from src/libsystemd/bus-match.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-message.c (renamed from src/libsystemd/bus-message.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-message.h (renamed from src/libsystemd/bus-message.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-objects.c (renamed from src/libsystemd/bus-objects.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-objects.h (renamed from src/libsystemd/bus-objects.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-protocol.h (renamed from src/libsystemd/bus-protocol.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-signature.c (renamed from src/libsystemd/bus-signature.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-signature.h (renamed from src/libsystemd/bus-signature.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-socket.c (renamed from src/libsystemd/bus-socket.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-socket.h (renamed from src/libsystemd/bus-socket.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-type.c (renamed from src/libsystemd/bus-type.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-type.h (renamed from src/libsystemd/bus-type.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-util.c (renamed from src/libsystemd/bus-util.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/bus-util.h (renamed from src/libsystemd/bus-util.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/busctl.c (renamed from src/libsystemd/busctl.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/kdbus.h (renamed from src/libsystemd/kdbus.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c (renamed from src/libsystemd/sd-bus.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/sd-memfd.c (renamed from src/libsystemd/sd-memfd.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-chat.c (renamed from src/libsystemd/test-bus-chat.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-cleanup.c (renamed from src/libsystemd/test-bus-cleanup.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-creds.c (renamed from src/libsystemd/test-bus-creds.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-error.c (renamed from src/libsystemd/test-bus-error.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-gvariant.c (renamed from src/libsystemd/test-bus-gvariant.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-introspect.c (renamed from src/libsystemd/test-bus-introspect.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-kernel-benchmark.c (renamed from src/libsystemd/test-bus-kernel-benchmark.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-kernel-bloom.c (renamed from src/libsystemd/test-bus-kernel-bloom.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-kernel.c (renamed from src/libsystemd/test-bus-kernel.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-marshal.c (renamed from src/libsystemd/test-bus-marshal.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-match.c (renamed from src/libsystemd/test-bus-match.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-memfd.c (renamed from src/libsystemd/test-bus-memfd.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-objects.c (renamed from src/libsystemd/test-bus-objects.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-server.c (renamed from src/libsystemd/test-bus-server.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-signature.c (renamed from src/libsystemd/test-bus-signature.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/test-bus-zero-copy.c (renamed from src/libsystemd/test-bus-zero-copy.c) | 0 | ||||
| l--------- | src/libsystemd/sd-event/Makefile | 1 | ||||
| -rw-r--r-- | src/libsystemd/sd-event/event-util.h (renamed from src/libsystemd/event-util.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-event/sd-event.c (renamed from src/libsystemd/sd-event.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-event/test-event.c (renamed from src/libsystemd/test-event.c) | 0 | ||||
| l--------- | src/libsystemd/sd-resolve/Makefile | 1 | ||||
| -rw-r--r-- | src/libsystemd/sd-resolve/resolve-util.h (renamed from src/libsystemd/resolve-util.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-resolve/sd-resolve.c (renamed from src/libsystemd/sd-resolve.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-resolve/test-resolve.c (renamed from src/libsystemd/test-resolve.c) | 0 | ||||
| l--------- | src/libsystemd/sd-rtnl/Makefile | 1 | ||||
| -rw-r--r-- | src/libsystemd/sd-rtnl/rtnl-internal.h (renamed from src/libsystemd/rtnl-internal.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-rtnl/rtnl-message.c (renamed from src/libsystemd/rtnl-message.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-rtnl/rtnl-util.c (renamed from src/libsystemd/rtnl-util.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-rtnl/rtnl-util.h (renamed from src/libsystemd/rtnl-util.h) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-rtnl/sd-rtnl.c (renamed from src/libsystemd/sd-rtnl.c) | 0 | ||||
| -rw-r--r-- | src/libsystemd/sd-rtnl/test-rtnl.c (renamed from src/libsystemd/test-rtnl.c) | 0 | ||||
| l--------- | src/libsystemd/sd-utf8/Makefile | 1 | ||||
| -rw-r--r-- | src/libsystemd/sd-utf8/sd-utf8.c (renamed from src/libsystemd/sd-utf8.c) | 0 |
81 files changed, 84 insertions, 77 deletions
diff --git a/Makefile.am b/Makefile.am index 8a897cddd4..935a1955ac 100644 --- 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 613b05c873..50a1692374 100644 --- 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 index 0000000000..d32542e2a6 --- /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 index fd7506b993..fd7506b993 100644 --- a/src/libsystemd/DIFFERENCES +++ b/src/libsystemd/sd-bus/DIFFERENCES diff --git a/src/libsystemd/GVARIANT-SERIALIZATION b/src/libsystemd/sd-bus/GVARIANT-SERIALIZATION index 5dffc25bb3..5dffc25bb3 100644 --- a/src/libsystemd/GVARIANT-SERIALIZATION +++ b/src/libsystemd/sd-bus/GVARIANT-SERIALIZATION diff --git a/src/libsystemd/sd-bus/Makefile b/src/libsystemd/sd-bus/Makefile new file mode 120000 index 0000000000..94aaae2c4d --- /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 index 67af27772e..67af27772e 100644 --- a/src/libsystemd/PORTING-DBUS1 +++ b/src/libsystemd/sd-bus/PORTING-DBUS1 diff --git a/src/libsystemd/bus-bloom.c b/src/libsystemd/sd-bus/bus-bloom.c index 9e51334b52..9e51334b52 100644 --- a/src/libsystemd/bus-bloom.c +++ b/src/libsystemd/sd-bus/bus-bloom.c diff --git a/src/libsystemd/bus-bloom.h b/src/libsystemd/sd-bus/bus-bloom.h index 422eb4e01a..422eb4e01a 100644 --- a/src/libsystemd/bus-bloom.h +++ b/src/libsystemd/sd-bus/bus-bloom.h diff --git a/src/libsystemd/bus-container.c b/src/libsystemd/sd-bus/bus-container.c index d330363b6f..d330363b6f 100644 --- a/src/libsystemd/bus-container.c +++ b/src/libsystemd/sd-bus/bus-container.c diff --git a/src/libsystemd/bus-container.h b/src/libsystemd/sd-bus/bus-container.h index c6f757a99b..c6f757a99b 100644 --- a/src/libsystemd/bus-container.h +++ b/src/libsystemd/sd-bus/bus-container.h diff --git a/src/libsystemd/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index e7e9ba07b0..e7e9ba07b0 100644 --- a/src/libsystemd/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c diff --git a/src/libsystemd/bus-control.h b/src/libsystemd/sd-bus/bus-control.h index b610bef842..b610bef842 100644 --- a/src/libsystemd/bus-control.h +++ b/src/libsystemd/sd-bus/bus-control.h diff --git a/src/libsystemd/bus-convenience.c b/src/libsystemd/sd-bus/bus-convenience.c index 3964960fab..3964960fab 100644 --- a/src/libsystemd/bus-convenience.c +++ b/src/libsystemd/sd-bus/bus-convenience.c diff --git a/src/libsystemd/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c index 52e55fc5e1..52e55fc5e1 100644 --- a/src/libsystemd/bus-creds.c +++ b/src/libsystemd/sd-bus/bus-creds.c diff --git a/src/libsystemd/bus-creds.h b/src/libsystemd/sd-bus/bus-creds.h index d8b4aca2a0..d8b4aca2a0 100644 --- a/src/libsystemd/bus-creds.h +++ b/src/libsystemd/sd-bus/bus-creds.h diff --git a/src/libsystemd/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c index 78e7597ed5..78e7597ed5 100644 --- a/src/libsystemd/bus-dump.c +++ b/src/libsystemd/sd-bus/bus-dump.c diff --git a/src/libsystemd/bus-dump.h b/src/libsystemd/sd-bus/bus-dump.h index bb1d25dc42..bb1d25dc42 100644 --- a/src/libsystemd/bus-dump.h +++ b/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 index df2c4d407d..df2c4d407d 100644 --- a/src/libsystemd/bus-error-mapping.gperf +++ b/src/libsystemd/sd-bus/bus-error-mapping.gperf diff --git a/src/libsystemd/bus-error.c b/src/libsystemd/sd-bus/bus-error.c index c2e41fb016..c2e41fb016 100644 --- a/src/libsystemd/bus-error.c +++ b/src/libsystemd/sd-bus/bus-error.c diff --git a/src/libsystemd/bus-error.h b/src/libsystemd/sd-bus/bus-error.h index cf0ad9d545..cf0ad9d545 100644 --- a/src/libsystemd/bus-error.h +++ b/src/libsystemd/sd-bus/bus-error.h diff --git a/src/libsystemd/bus-gvariant.c b/src/libsystemd/sd-bus/bus-gvariant.c index dc40009925..dc40009925 100644 --- a/src/libsystemd/bus-gvariant.c +++ b/src/libsystemd/sd-bus/bus-gvariant.c diff --git a/src/libsystemd/bus-gvariant.h b/src/libsystemd/sd-bus/bus-gvariant.h index b4bd2a50f0..b4bd2a50f0 100644 --- a/src/libsystemd/bus-gvariant.h +++ b/src/libsystemd/sd-bus/bus-gvariant.h diff --git a/src/libsystemd/bus-internal.c b/src/libsystemd/sd-bus/bus-internal.c index 0bea8cac49..0bea8cac49 100644 --- a/src/libsystemd/bus-internal.c +++ b/src/libsystemd/sd-bus/bus-internal.c diff --git a/src/libsystemd/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h index 7c92293771..7c92293771 100644 --- a/src/libsystemd/bus-internal.h +++ b/src/libsystemd/sd-bus/bus-internal.h diff --git a/src/libsystemd/bus-introspect.c b/src/libsystemd/sd-bus/bus-introspect.c index d528ab2a04..d528ab2a04 100644 --- a/src/libsystemd/bus-introspect.c +++ b/src/libsystemd/sd-bus/bus-introspect.c diff --git a/src/libsystemd/bus-introspect.h b/src/libsystemd/sd-bus/bus-introspect.h index 98312d123b..98312d123b 100644 --- a/src/libsystemd/bus-introspect.h +++ b/src/libsystemd/sd-bus/bus-introspect.h diff --git a/src/libsystemd/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index f85b4d5676..f85b4d5676 100644 --- a/src/libsystemd/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c diff --git a/src/libsystemd/bus-kernel.h b/src/libsystemd/sd-bus/bus-kernel.h index 2aba0bbe0a..2aba0bbe0a 100644 --- a/src/libsystemd/bus-kernel.h +++ b/src/libsystemd/sd-bus/bus-kernel.h diff --git a/src/libsystemd/bus-match.c b/src/libsystemd/sd-bus/bus-match.c index ffc97562fd..ffc97562fd 100644 --- a/src/libsystemd/bus-match.c +++ b/src/libsystemd/sd-bus/bus-match.c diff --git a/src/libsystemd/bus-match.h b/src/libsystemd/sd-bus/bus-match.h index 056082b908..056082b908 100644 --- a/src/libsystemd/bus-match.h +++ b/src/libsystemd/sd-bus/bus-match.h diff --git a/src/libsystemd/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index 1a2039b8cd..1a2039b8cd 100644 --- a/src/libsystemd/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c diff --git a/src/libsystemd/bus-message.h b/src/libsystemd/sd-bus/bus-message.h index 5322375ef1..5322375ef1 100644 --- a/src/libsystemd/bus-message.h +++ b/src/libsystemd/sd-bus/bus-message.h diff --git a/src/libsystemd/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c index b116a5dd10..b116a5dd10 100644 --- a/src/libsystemd/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c diff --git a/src/libsystemd/bus-objects.h b/src/libsystemd/sd-bus/bus-objects.h index 420edd9478..420edd9478 100644 --- a/src/libsystemd/bus-objects.h +++ b/src/libsystemd/sd-bus/bus-objects.h diff --git a/src/libsystemd/bus-protocol.h b/src/libsystemd/sd-bus/bus-protocol.h index 5046d17a10..5046d17a10 100644 --- a/src/libsystemd/bus-protocol.h +++ b/src/libsystemd/sd-bus/bus-protocol.h diff --git a/src/libsystemd/bus-signature.c b/src/libsystemd/sd-bus/bus-signature.c index 1e5bf4821d..1e5bf4821d 100644 --- a/src/libsystemd/bus-signature.c +++ b/src/libsystemd/sd-bus/bus-signature.c diff --git a/src/libsystemd/bus-signature.h b/src/libsystemd/sd-bus/bus-signature.h index 2e06e30548..2e06e30548 100644 --- a/src/libsystemd/bus-signature.h +++ b/src/libsystemd/sd-bus/bus-signature.h diff --git a/src/libsystemd/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c index 0c4b6af447..0c4b6af447 100644 --- a/src/libsystemd/bus-socket.c +++ b/src/libsystemd/sd-bus/bus-socket.c diff --git a/src/libsystemd/bus-socket.h b/src/libsystemd/sd-bus/bus-socket.h index 5a1c7d4cf2..5a1c7d4cf2 100644 --- a/src/libsystemd/bus-socket.h +++ b/src/libsystemd/sd-bus/bus-socket.h diff --git a/src/libsystemd/bus-type.c b/src/libsystemd/sd-bus/bus-type.c index b7914d15d3..b7914d15d3 100644 --- a/src/libsystemd/bus-type.c +++ b/src/libsystemd/sd-bus/bus-type.c diff --git a/src/libsystemd/bus-type.h b/src/libsystemd/sd-bus/bus-type.h index 2e423bbfdb..2e423bbfdb 100644 --- a/src/libsystemd/bus-type.h +++ b/src/libsystemd/sd-bus/bus-type.h diff --git a/src/libsystemd/bus-util.c b/src/libsystemd/sd-bus/bus-util.c index a468bcad6b..a468bcad6b 100644 --- a/src/libsystemd/bus-util.c +++ b/src/libsystemd/sd-bus/bus-util.c diff --git a/src/libsystemd/bus-util.h b/src/libsystemd/sd-bus/bus-util.h index 51e1613c17..51e1613c17 100644 --- a/src/libsystemd/bus-util.h +++ b/src/libsystemd/sd-bus/bus-util.h diff --git a/src/libsystemd/busctl.c b/src/libsystemd/sd-bus/busctl.c index e962ba3f63..e962ba3f63 100644 --- a/src/libsystemd/busctl.c +++ b/src/libsystemd/sd-bus/busctl.c diff --git a/src/libsystemd/kdbus.h b/src/libsystemd/sd-bus/kdbus.h index fe0bb48728..fe0bb48728 100644 --- a/src/libsystemd/kdbus.h +++ b/src/libsystemd/sd-bus/kdbus.h diff --git a/src/libsystemd/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 95d80db240..95d80db240 100644 --- a/src/libsystemd/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c diff --git a/src/libsystemd/sd-memfd.c b/src/libsystemd/sd-bus/sd-memfd.c index 112c95fb43..112c95fb43 100644 --- a/src/libsystemd/sd-memfd.c +++ b/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 index 021379f0b0..021379f0b0 100644 --- a/src/libsystemd/test-bus-chat.c +++ b/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 index d8ddb8452e..d8ddb8452e 100644 --- a/src/libsystemd/test-bus-cleanup.c +++ b/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 index 966b84c39e..966b84c39e 100644 --- a/src/libsystemd/test-bus-creds.c +++ b/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 index b78be5499c..b78be5499c 100644 --- a/src/libsystemd/test-bus-error.c +++ b/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 index cb07c96273..cb07c96273 100644 --- a/src/libsystemd/test-bus-gvariant.c +++ b/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 index 67b6461f30..67b6461f30 100644 --- a/src/libsystemd/test-bus-introspect.c +++ b/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 index 04627d9a77..04627d9a77 100644 --- a/src/libsystemd/test-bus-kernel-benchmark.c +++ b/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 index 0ecad18f45..0ecad18f45 100644 --- a/src/libsystemd/test-bus-kernel-bloom.c +++ b/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 index 9b17a35e4a..9b17a35e4a 100644 --- a/src/libsystemd/test-bus-kernel.c +++ b/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 index 4fad049ab6..4fad049ab6 100644 --- a/src/libsystemd/test-bus-marshal.c +++ b/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 index 7227e2585d..7227e2585d 100644 --- a/src/libsystemd/test-bus-match.c +++ b/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 index b9d6a250c3..b9d6a250c3 100644 --- a/src/libsystemd/test-bus-memfd.c +++ b/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 index e2423c7f67..e2423c7f67 100644 --- a/src/libsystemd/test-bus-objects.c +++ b/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 index 0e65ee782a..0e65ee782a 100644 --- a/src/libsystemd/test-bus-server.c +++ b/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 index 3fc565c620..3fc565c620 100644 --- a/src/libsystemd/test-bus-signature.c +++ b/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 index 5ad8ed54b0..5ad8ed54b0 100644 --- a/src/libsystemd/test-bus-zero-copy.c +++ b/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 index 0000000000..94aaae2c4d --- /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 index e58020dedf..e58020dedf 100644 --- a/src/libsystemd/event-util.h +++ b/src/libsystemd/sd-event/event-util.h diff --git a/src/libsystemd/sd-event.c b/src/libsystemd/sd-event/sd-event.c index f33a9ecf9a..f33a9ecf9a 100644 --- a/src/libsystemd/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c diff --git a/src/libsystemd/test-event.c b/src/libsystemd/sd-event/test-event.c index 28ef6a3692..28ef6a3692 100644 --- a/src/libsystemd/test-event.c +++ b/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 index 0000000000..94aaae2c4d --- /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 index 58df7385c0..58df7385c0 100644 --- a/src/libsystemd/resolve-util.h +++ b/src/libsystemd/sd-resolve/resolve-util.h diff --git a/src/libsystemd/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c index 464967b362..464967b362 100644 --- a/src/libsystemd/sd-resolve.c +++ b/src/libsystemd/sd-resolve/sd-resolve.c diff --git a/src/libsystemd/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c index 3903e64d70..3903e64d70 100644 --- a/src/libsystemd/test-resolve.c +++ b/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 index 0000000000..94aaae2c4d --- /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 index 2e0b7b8f37..2e0b7b8f37 100644 --- a/src/libsystemd/rtnl-internal.h +++ b/src/libsystemd/sd-rtnl/rtnl-internal.h diff --git a/src/libsystemd/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c index 984115c3c0..984115c3c0 100644 --- a/src/libsystemd/rtnl-message.c +++ b/src/libsystemd/sd-rtnl/rtnl-message.c diff --git a/src/libsystemd/rtnl-util.c b/src/libsystemd/sd-rtnl/rtnl-util.c index dfc0050def..dfc0050def 100644 --- a/src/libsystemd/rtnl-util.c +++ b/src/libsystemd/sd-rtnl/rtnl-util.c diff --git a/src/libsystemd/rtnl-util.h b/src/libsystemd/sd-rtnl/rtnl-util.h index 013002dd60..013002dd60 100644 --- a/src/libsystemd/rtnl-util.h +++ b/src/libsystemd/sd-rtnl/rtnl-util.h diff --git a/src/libsystemd/sd-rtnl.c b/src/libsystemd/sd-rtnl/sd-rtnl.c index 08b82ab2a9..08b82ab2a9 100644 --- a/src/libsystemd/sd-rtnl.c +++ b/src/libsystemd/sd-rtnl/sd-rtnl.c diff --git a/src/libsystemd/test-rtnl.c b/src/libsystemd/sd-rtnl/test-rtnl.c index 58654e990a..58654e990a 100644 --- a/src/libsystemd/test-rtnl.c +++ b/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 index 0000000000..94aaae2c4d --- /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 index 6f2aa6064c..6f2aa6064c 100644 --- a/src/libsystemd/sd-utf8.c +++ b/src/libsystemd/sd-utf8/sd-utf8.c |