diff options
98 files changed, 136 insertions, 142 deletions
diff --git a/config.mk.in b/config.mk.in index 135cd4f758..f6e99c9c36 100644 --- a/config.mk.in +++ b/config.mk.in @@ -107,12 +107,10 @@ libcore.CPPFLAGS = -I$(topsrcdir)/src/libcore $(libshared.CP libcore.DEPENDS = $(topoutdir)/src/libcore/libcore.la libfirewall.CPPFLAGS = -I$(topsrcdir)/src/libfirewall -I$(topoutdir)/src/libfirewall libfirewall.DEPENDS = $(topoutdir)/src/libfirewall/libfirewall.la -libshared.CPPFLAGS = -I$(topsrcdir)/src/libshared -I$(topoutdir)/src/libshared $(libsystemd-internal.CPPFLAGS) -I$(topsrcdir)/src/libudev/src -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus +libshared.CPPFLAGS = -I$(topsrcdir)/src/libshared -I$(topoutdir)/src/libshared $(libsystemd-internal.CPPFLAGS) -I$(topsrcdir)/src/libudev/src libshared.DEPENDS = $(topoutdir)/src/libshared/libshared.la -libsystemd-internal.CPPFLAGS = $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) -libsystemd-internal.DEPENDS = $(topoutdir)/src/libsystemd/libsystemd-internal/libsystemd-internal.la -libsystemd-journal-internal.CPPFLAGS = $(libsystemd.CPPFLAGS) -libsystemd-journal-internal.DEPENDS = $(topoutdir)/src/libsystemd/libsystemd-journal-internal/libsystemd-journal-internal.la +libsystemd-internal.CPPFLAGS = -I$(topsrcdir)/src/libsystemd/src -I$(topoutdir)/src/libsystemd/src $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) +libsystemd-internal.DEPENDS = $(topoutdir)/src/libsystemd/src/libsystemd-internal.la libsystemd-network.CPPFLAGS = -I$(topsrcdir)/src/libsystemd-network -I$(topsrcdir)/src/libudev/src $(libsystemd.CPPFLAGS) libsystemd-network.DEPENDS = $(topoutdir)/src/libsystemd-network/libsystemd-network.la libsystemd.CPPFLAGS = -I$(topsrcdir)/src/libsystemd/include diff --git a/src/busctl/Makefile b/src/busctl/Makefile index 4ea6019bc1..e7ef92824c 100644 --- a/src/busctl/Makefile +++ b/src/busctl/Makefile @@ -34,6 +34,4 @@ busctl_SOURCES = \ busctl_LDADD = \ libshared.la -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c index 0281409edf..dd49f2482e 100644 --- a/src/busctl/busctl.c +++ b/src/busctl/busctl.c @@ -22,10 +22,10 @@ #include <systemd/sd-bus.h> #include "alloc-util.h" -#include "bus-dump.h" -#include "bus-internal.h" -#include "bus-signature.h" -#include "bus-type.h" +#include "sd-bus/bus-dump.h" +#include "sd-bus/bus-internal.h" +#include "sd-bus/bus-signature.h" +#include "sd-bus/bus-type.h" #include "bus-util.h" #include "busctl-introspect.h" #include "escape.h" diff --git a/src/grp-coredump/coredumpctl/Makefile b/src/grp-coredump/coredumpctl/Makefile index 4b291feb44..47a4397fa4 100644 --- a/src/grp-coredump/coredumpctl/Makefile +++ b/src/grp-coredump/coredumpctl/Makefile @@ -38,6 +38,4 @@ dist_bashcompletion_data += \ dist_zshcompletion_data += \ shell-completion/zsh/_coredumpctl -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-coredump/coredumpctl/coredumpctl.c b/src/grp-coredump/coredumpctl/coredumpctl.c index dc95da3613..d5bad73378 100644 --- a/src/grp-coredump/coredumpctl/coredumpctl.c +++ b/src/grp-coredump/coredumpctl/coredumpctl.c @@ -27,10 +27,10 @@ #include <systemd/sd-journal.h> #include "alloc-util.h" -#include "compress.h" +#include "sd-journal/compress.h" #include "fd-util.h" #include "fileio.h" -#include "journal-internal.h" +#include "sd-journal/journal-internal.h" #include "log.h" #include "macro.h" #include "pager.h" diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile index 083a80571a..f36ccaf6cc 100644 --- a/src/grp-coredump/systemd-coredump/Makefile +++ b/src/grp-coredump/systemd-coredump/Makefile @@ -78,7 +78,6 @@ EXTRA_DIST += \ sysctl.d/50-coredump.conf.in \ units/systemd-coredump@.service.in -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal systemd.CPPFLAGS += -I$(topsrcdir)/src/grp-journal/libjournal-core systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" diff --git a/src/grp-coredump/systemd-coredump/coredump.c b/src/grp-coredump/systemd-coredump/coredump.c index bf0e0a038b..c4690930b4 100644 --- a/src/grp-coredump/systemd-coredump/coredump.c +++ b/src/grp-coredump/systemd-coredump/coredump.c @@ -36,7 +36,7 @@ #include "alloc-util.h" #include "capability-util.h" #include "cgroup-util.h" -#include "compress.h" +#include "sd-journal/compress.h" #include "conf-parser.h" #include "copy.h" #include "coredump-vacuum.h" diff --git a/src/grp-journal/libjournal-core/journald-server.h b/src/grp-journal/libjournal-core/journald-server.h index bebb056aa7..65f8c1fc6c 100644 --- a/src/grp-journal/libjournal-core/journald-server.h +++ b/src/grp-journal/libjournal-core/journald-server.h @@ -27,7 +27,7 @@ typedef struct Server Server; #include "hashmap.h" -#include "journal-file.h" +#include "sd-journal/journal-file.h" #include "journald-rate-limit.h" #include "journald-stream.h" #include "list.h" diff --git a/src/grp-machine/libmachine-core/Makefile b/src/grp-machine/libmachine-core/Makefile index d22e01e25f..3881224746 100644 --- a/src/grp-machine/libmachine-core/Makefile +++ b/src/grp-machine/libmachine-core/Makefile @@ -49,6 +49,4 @@ test_machine_tables_LDADD = \ tests += \ test-machine-tables -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile index 00a62bbafc..c7c0d76907 100644 --- a/src/grp-machine/nss-mymachines/Makefile +++ b/src/grp-machine/nss-mymachines/Makefile @@ -43,6 +43,4 @@ libnss_mymachines_la_LIBADD = \ lib_LTLIBRARIES += \ libnss_mymachines.la -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-resolve/nss-resolve/Makefile b/src/grp-resolve/nss-resolve/Makefile index 8ac66b2f7c..acfbe831ae 100644 --- a/src/grp-resolve/nss-resolve/Makefile +++ b/src/grp-resolve/nss-resolve/Makefile @@ -43,6 +43,4 @@ libnss_resolve_la_LIBADD = \ lib_LTLIBRARIES += \ libnss_resolve.la -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-resolve/nss-resolve/nss-resolve.c b/src/grp-resolve/nss-resolve/nss-resolve.c index 4c2101d856..d2b501f153 100644 --- a/src/grp-resolve/nss-resolve/nss-resolve.c +++ b/src/grp-resolve/nss-resolve/nss-resolve.c @@ -26,7 +26,7 @@ #include <systemd/sd-bus.h> -#include "bus-common-errors.h" +#include "sd-bus/bus-common-errors.h" #include "in-addr-util.h" #include "macro.h" #include "nss-util.h" diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile index 8d26124091..33b53fedef 100644 --- a/src/grp-resolve/systemd-resolved/Makefile +++ b/src/grp-resolve/systemd-resolved/Makefile @@ -223,7 +223,6 @@ EXTRA_DIST += \ $(outdir)/dns-type.o: $(outdir)/dns_type-from-name.h $(outdir)/dns_type-to-name.h -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-resolve/systemd-resolved/resolve-tool.c b/src/grp-resolve/systemd-resolved/resolve-tool.c index fbf7b0e4f6..65ad9d29db 100644 --- a/src/grp-resolve/systemd-resolved/resolve-tool.c +++ b/src/grp-resolve/systemd-resolved/resolve-tool.c @@ -24,7 +24,7 @@ #include "af-list.h" #include "alloc-util.h" -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" #include "escape.h" #include "in-addr-util.h" diff --git a/src/grp-resolve/systemd-resolved/resolved-bus.c b/src/grp-resolve/systemd-resolved/resolved-bus.c index 33f7c61557..5f2c70eedf 100644 --- a/src/grp-resolve/systemd-resolved/resolved-bus.c +++ b/src/grp-resolve/systemd-resolved/resolved-bus.c @@ -18,7 +18,7 @@ ***/ #include "alloc-util.h" -#include "bus-common-errors.h" +#include "sd-bus/bus-common-errors.h" #include "bus-util.h" #include "dns-domain.h" #include "resolved-bus.h" diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-query.c b/src/grp-resolve/systemd-resolved/resolved-dns-query.c index ea04e58d61..20dcab78ff 100644 --- a/src/grp-resolve/systemd-resolved/resolved-dns-query.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.c @@ -21,7 +21,7 @@ #include "dns-domain.h" #include "dns-type.h" #include "hostname-util.h" -#include "local-addresses.h" +#include "sd-netlink/local-addresses.h" #include "resolved-dns-query.h" #include "resolved-dns-synthesize.h" #include "resolved-etc-hosts.h" diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c index e3003411f7..5989f049ff 100644 --- a/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c @@ -19,7 +19,7 @@ #include "alloc-util.h" #include "hostname-util.h" -#include "local-addresses.h" +#include "sd-netlink/local-addresses.h" #include "resolved-dns-synthesize.h" int dns_synthesize_ifindex(int ifindex) { diff --git a/src/grp-timedate/systemd-timedated/Makefile b/src/grp-timedate/systemd-timedated/Makefile index 5d397e0bb0..798e3ba5a4 100644 --- a/src/grp-timedate/systemd-timedated/Makefile +++ b/src/grp-timedate/systemd-timedated/Makefile @@ -62,6 +62,4 @@ polkitpolicy_in_files += \ EXTRA_DIST += \ units/systemd-timedated.service.in -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-timedate/systemd-timedated/timedated.c b/src/grp-timedate/systemd-timedated/timedated.c index 51a13fcf49..b61fce1eb8 100644 --- a/src/grp-timedate/systemd-timedated/timedated.c +++ b/src/grp-timedate/systemd-timedated/timedated.c @@ -26,8 +26,8 @@ #include <systemd/sd-messages.h> #include "alloc-util.h" -#include "bus-common-errors.h" -#include "bus-error.h" +#include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" #include "clock-util.h" #include "def.h" diff --git a/src/grp-timedate/timedatectl/Makefile b/src/grp-timedate/timedatectl/Makefile index 1dfb81c2f6..4394bf892b 100644 --- a/src/grp-timedate/timedatectl/Makefile +++ b/src/grp-timedate/timedatectl/Makefile @@ -40,6 +40,4 @@ dist_zshcompletion_data += \ shell-completion/zsh/_timedatectl endif # ENABLE_TIMEDATED -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-timedate/timedatectl/timedatectl.c b/src/grp-timedate/timedatectl/timedatectl.c index 1fd542fb49..cea6093d97 100644 --- a/src/grp-timedate/timedatectl/timedatectl.c +++ b/src/grp-timedate/timedatectl/timedatectl.c @@ -25,7 +25,7 @@ #include <systemd/sd-bus.h> -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" #include "pager.h" #include "parse-util.h" diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile index 56efd36aa6..d47fbe3257 100644 --- a/src/grp-udev/libudev-core/Makefile +++ b/src/grp-udev/libudev-core/Makefile @@ -102,8 +102,6 @@ libudev-core.la.SOURCES = $(patsubst src/udev/%,%,$(filter %.c,$(_libudev_core_l libudev-core.la.DEPENDS = $(addprefix $(outdir)/,$(libudev-core.la.SOURCES:.c=.lo)) at.subdirs += net $(outdir)/udev-builtin-keyboard.lo: $(outdir)/keyboard-keys-from-name.h -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-netlink -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/libudev-core/net/Makefile b/src/grp-udev/libudev-core/net/Makefile index 7ff2f40349..153afd5089 100644 --- a/src/grp-udev/libudev-core/net/Makefile +++ b/src/grp-udev/libudev-core/net/Makefile @@ -26,6 +26,5 @@ include $(topsrcdir)/build-aux/Makefile.head.mk systemd.CPPFLAGS += $(libshared.CPPFLAGS) systemd.CPPFLAGS += $(libsystemd-network.CPPFLAGS) -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-netlink include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/libudev-core/net/link-config.c b/src/grp-udev/libudev-core/net/link-config.c index 350cd24e9c..4582c8b90d 100644 --- a/src/grp-udev/libudev-core/net/link-config.c +++ b/src/grp-udev/libudev-core/net/link-config.c @@ -30,7 +30,7 @@ #include "link-config.h" #include "log.h" #include "missing.h" -#include "netlink-util.h" +#include "sd-netlink/netlink-util.h" #include "network-internal.h" #include "parse-util.h" #include "path-util.h" diff --git a/src/grp-udev/libudev-core/sd-login.c b/src/grp-udev/libudev-core/sd-login.c index 95a6042740..913dcedc6a 120000 --- a/src/grp-udev/libudev-core/sd-login.c +++ b/src/grp-udev/libudev-core/sd-login.c @@ -1 +1 @@ -../../libsystemd/libsystemd-internal/sd-login/sd-login.c
\ No newline at end of file +../../libsystemd/src/sd-login/sd-login.c
\ No newline at end of file diff --git a/src/grp-udev/libudev-core/udev-builtin-hwdb.c b/src/grp-udev/libudev-core/udev-builtin-hwdb.c index b96f39ba20..64790c31bb 100644 --- a/src/grp-udev/libudev-core/udev-builtin-hwdb.c +++ b/src/grp-udev/libudev-core/udev-builtin-hwdb.c @@ -25,7 +25,7 @@ #include <systemd/sd-hwdb.h> #include "alloc-util.h" -#include "hwdb-util.h" +#include "sd-hwdb/hwdb-util.h" #include "string-util.h" #include "udev-util.h" #include "udev.h" diff --git a/src/grp-udev/libudev-core/udev-event.c b/src/grp-udev/libudev-core/udev-event.c index 8d601c9c2c..2b79d24d31 100644 --- a/src/grp-udev/libudev-core/udev-event.c +++ b/src/grp-udev/libudev-core/udev-event.c @@ -33,7 +33,7 @@ #include "alloc-util.h" #include "fd-util.h" #include "formats-util.h" -#include "netlink-util.h" +#include "sd-netlink/netlink-util.h" #include "process-util.h" #include "signal-util.h" #include "string-util.h" diff --git a/src/grp-udev/udevadm/Makefile b/src/grp-udev/udevadm/Makefile index e3c5ed351f..ef173b234b 100644 --- a/src/grp-udev/udevadm/Makefile +++ b/src/grp-udev/udevadm/Makefile @@ -42,7 +42,6 @@ udevadm_SOURCES = \ udevadm_LDADD = \ libudev-core.la -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-udev/udevadm/udevadm-hwdb.c b/src/grp-udev/udevadm/udevadm-hwdb.c index 948ad0f5a5..d727ed22a8 100644 --- a/src/grp-udev/udevadm/udevadm-hwdb.c +++ b/src/grp-udev/udevadm/udevadm-hwdb.c @@ -26,8 +26,8 @@ #include "conf-files.h" #include "fileio.h" #include "fs-util.h" -#include "hwdb-internal.h" -#include "hwdb-util.h" +#include "sd-hwdb/hwdb-internal.h" +#include "sd-hwdb/hwdb-util.h" #include "strbuf.h" #include "string-util.h" #include "udev.h" diff --git a/src/libcore/Makefile b/src/libcore/Makefile index 53059eda20..23032ea6f7 100644 --- a/src/libcore/Makefile +++ b/src/libcore/Makefile @@ -166,7 +166,6 @@ libcore_la_LIBADD = \ $(outdir)/load-fragment-gperf-nulstr.c: $(outdir)/load-fragment-gperf.gperf $(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src systemd.CPPFLAGS += -DMOUNT_PATH=\"$(MOUNT_PATH)\" systemd.CPPFLAGS += -DUMOUNT_PATH=\"$(UMOUNT_PATH)\" diff --git a/src/libcore/automount.c b/src/libcore/automount.c index f06d837e30..fdd23327e2 100644 --- a/src/libcore/automount.c +++ b/src/libcore/automount.c @@ -30,7 +30,7 @@ #include "alloc-util.h" #include "async.h" #include "automount.h" -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" #include "dbus-automount.h" #include "fd-util.h" diff --git a/src/libcore/bus-policy.c b/src/libcore/bus-policy.c index 4907c268e8..4976908b90 100644 --- a/src/libcore/bus-policy.c +++ b/src/libcore/bus-policy.c @@ -20,9 +20,9 @@ #include <stdlib.h> #include "alloc-util.h" -#include "bus-kernel.h" +#include "sd-bus/bus-kernel.h" #include "bus-policy.h" -#include "kdbus.h" +#include "sd-bus/kdbus.h" #include "string-table.h" #include "user-util.h" #include "util.h" diff --git a/src/libcore/bus-policy.h b/src/libcore/bus-policy.h index 5b2c4d5953..2b3b382826 100644 --- a/src/libcore/bus-policy.h +++ b/src/libcore/bus-policy.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "kdbus.h" +#include "sd-bus/kdbus.h" #include "list.h" #include "macro.h" diff --git a/src/libcore/busname.c b/src/libcore/busname.c index f03a95c24e..206f76787a 100644 --- a/src/libcore/busname.c +++ b/src/libcore/busname.c @@ -20,15 +20,15 @@ #include <sys/mman.h> #include "alloc-util.h" -#include "bus-internal.h" -#include "bus-kernel.h" +#include "sd-bus/bus-internal.h" +#include "sd-bus/bus-kernel.h" #include "bus-policy.h" #include "bus-util.h" #include "busname.h" #include "dbus-busname.h" #include "fd-util.h" #include "formats-util.h" -#include "kdbus.h" +#include "sd-bus/kdbus.h" #include "parse-util.h" #include "process-util.h" #include "service.h" diff --git a/src/libcore/dbus-manager.c b/src/libcore/dbus-manager.c index 86722e1162..4d2f425692 100644 --- a/src/libcore/dbus-manager.c +++ b/src/libcore/dbus-manager.c @@ -24,7 +24,7 @@ #include "alloc-util.h" #include "architecture.h" #include "build.h" -#include "bus-common-errors.h" +#include "sd-bus/bus-common-errors.h" #include "clock-util.h" #include "dbus-execute.h" #include "dbus-job.h" diff --git a/src/libcore/dbus-scope.c b/src/libcore/dbus-scope.c index 34ee9a8fa9..b5a3072544 100644 --- a/src/libcore/dbus-scope.c +++ b/src/libcore/dbus-scope.c @@ -18,8 +18,8 @@ ***/ #include "alloc-util.h" -#include "bus-common-errors.h" -#include "bus-internal.h" +#include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-internal.h" #include "bus-util.h" #include "dbus-cgroup.h" #include "dbus-kill.h" diff --git a/src/libcore/dbus-unit.c b/src/libcore/dbus-unit.c index dcd8db0898..8d5b1bad85 100644 --- a/src/libcore/dbus-unit.c +++ b/src/libcore/dbus-unit.c @@ -20,7 +20,7 @@ #include <systemd/sd-bus.h> #include "alloc-util.h" -#include "bus-common-errors.h" +#include "sd-bus/bus-common-errors.h" #include "cgroup-util.h" #include "dbus-unit.h" #include "dbus.h" diff --git a/src/libcore/dbus.c b/src/libcore/dbus.c index 1b217da303..987b7fe5f1 100644 --- a/src/libcore/dbus.c +++ b/src/libcore/dbus.c @@ -24,9 +24,9 @@ #include <systemd/sd-bus.h> #include "alloc-util.h" -#include "bus-common-errors.h" -#include "bus-error.h" -#include "bus-internal.h" +#include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-error.h" +#include "sd-bus/bus-internal.h" #include "bus-util.h" #include "dbus-cgroup.h" #include "dbus-execute.h" diff --git a/src/libcore/failure-action.c b/src/libcore/failure-action.c index ddae46190f..b40c8b0dbc 100644 --- a/src/libcore/failure-action.c +++ b/src/libcore/failure-action.c @@ -21,7 +21,7 @@ #include <sys/reboot.h> #include <linux/reboot.h> -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" #include "failure-action.h" #include "special.h" diff --git a/src/libcore/load-fragment.c b/src/libcore/load-fragment.c index 86b4fb071b..d793f12563 100644 --- a/src/libcore/load-fragment.c +++ b/src/libcore/load-fragment.c @@ -32,8 +32,8 @@ #include "af-list.h" #include "alloc-util.h" -#include "bus-error.h" -#include "bus-internal.h" +#include "sd-bus/bus-error.h" +#include "sd-bus/bus-internal.h" #include "bus-util.h" #include "cap-list.h" #include "capability-util.h" diff --git a/src/libcore/manager.c b/src/libcore/manager.c index 831fdbaabf..1b8d61fc70 100644 --- a/src/libcore/manager.c +++ b/src/libcore/manager.c @@ -41,9 +41,9 @@ #include "alloc-util.h" #include "audit-fd.h" #include "boot-timestamps.h" -#include "bus-common-errors.h" -#include "bus-error.h" -#include "bus-kernel.h" +#include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-error.h" +#include "sd-bus/bus-kernel.h" #include "bus-util.h" #include "dbus-job.h" #include "dbus-manager.h" diff --git a/src/libcore/path.c b/src/libcore/path.c index 0dd0d375d8..968bd5057e 100644 --- a/src/libcore/path.c +++ b/src/libcore/path.c @@ -22,7 +22,7 @@ #include <sys/inotify.h> #include <unistd.h> -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" #include "dbus-path.h" #include "fd-util.h" diff --git a/src/libcore/service.c b/src/libcore/service.c index 7ebabca5d6..f585743a32 100644 --- a/src/libcore/service.c +++ b/src/libcore/service.c @@ -23,8 +23,8 @@ #include "alloc-util.h" #include "async.h" -#include "bus-error.h" -#include "bus-kernel.h" +#include "sd-bus/bus-error.h" +#include "sd-bus/bus-kernel.h" #include "bus-util.h" #include "dbus-service.h" #include "def.h" diff --git a/src/libcore/socket.c b/src/libcore/socket.c index f6204d04bf..fd4ea5f9a9 100644 --- a/src/libcore/socket.c +++ b/src/libcore/socket.c @@ -29,7 +29,7 @@ #include <linux/sctp.h> #include "alloc-util.h" -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" #include "copy.h" #include "dbus-socket.h" diff --git a/src/libcore/timer.c b/src/libcore/timer.c index 3206296f09..cf7249af09 100644 --- a/src/libcore/timer.c +++ b/src/libcore/timer.c @@ -20,7 +20,7 @@ #include <errno.h> #include "alloc-util.h" -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" #include "dbus-timer.h" #include "fs-util.h" diff --git a/src/libcore/transaction.c b/src/libcore/transaction.c index e06a48a2f1..5233f89204 100644 --- a/src/libcore/transaction.c +++ b/src/libcore/transaction.c @@ -21,8 +21,8 @@ #include <unistd.h> #include "alloc-util.h" -#include "bus-common-errors.h" -#include "bus-error.h" +#include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-error.h" #include "terminal-util.h" #include "transaction.h" #include "dbus-unit.h" diff --git a/src/libcore/unit.c b/src/libcore/unit.c index 8bd39f87f9..416c1ec7e9 100644 --- a/src/libcore/unit.c +++ b/src/libcore/unit.c @@ -27,7 +27,7 @@ #include <systemd/sd-messages.h> #include "alloc-util.h" -#include "bus-common-errors.h" +#include "sd-bus/bus-common-errors.h" #include "bus-util.h" #include "cgroup-util.h" #include "dbus-unit.h" diff --git a/src/libshared/Makefile b/src/libshared/Makefile index 052865e882..914b38868f 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -27,8 +27,6 @@ noinst_LTLIBRARIES += \ libshared.la libshared_la_SOURCES = \ - src/libsystemd/sd-netlink/local-addresses.h \ - src/libsystemd/sd-netlink/local-addresses.c \ src/shared/output-mode.h \ src/shared/output-mode.c \ src/shared/gpt.h \ @@ -136,7 +134,6 @@ libshared_la_CFLAGS = \ libshared_la_LIBADD = \ libsystemd-internal.la \ - libsystemd-journal-internal.la \ libudev-internal.la \ $(ACL_LIBS) \ $(LIBIDN_LIBS) \ @@ -148,9 +145,6 @@ test_local_addresses_SOURCES = \ test_local_addresses_LDADD = \ libshared.la -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus - systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" systemd.CPPFLAGS += -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" systemd.CPPFLAGS += -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" diff --git a/src/libshared/bus-unit-util.c b/src/libshared/bus-unit-util.c index f68c4a41ac..dcd045eddd 100644 --- a/src/libshared/bus-unit-util.c +++ b/src/libshared/bus-unit-util.c @@ -18,7 +18,7 @@ ***/ #include "alloc-util.h" -#include "bus-internal.h" +#include "sd-bus/bus-internal.h" #include "bus-unit-util.h" #include "bus-util.h" #include "cgroup-util.h" diff --git a/src/libshared/bus-util.c b/src/libshared/bus-util.c index 62b5585e84..62c77a565a 100644 --- a/src/libshared/bus-util.c +++ b/src/libshared/bus-util.c @@ -35,9 +35,9 @@ #include <systemd/sd-id128.h> #include "alloc-util.h" -#include "bus-internal.h" +#include "sd-bus/bus-internal.h" #include "bus-label.h" -#include "bus-message.h" +#include "sd-bus/bus-message.h" #include "bus-util.h" #include "def.h" #include "escape.h" diff --git a/src/libshared/logs-show.c b/src/libshared/logs-show.c index 294fa3bede..97d0d2ffe4 100644 --- a/src/libshared/logs-show.c +++ b/src/libshared/logs-show.c @@ -37,7 +37,7 @@ #include "hashmap.h" #include "hostname-util.h" #include "io-util.h" -#include "journal-internal.h" +#include "sd-journal/journal-internal.h" #include "log.h" #include "logs-show.h" #include "macro.h" diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile index 97fa201656..a193f4592d 100644 --- a/src/libsystemd/Makefile +++ b/src/libsystemd/Makefile @@ -108,7 +108,7 @@ test_libsystemd_sym_LDADD = \ libsystemd.la $(outdir)/libsystemd.la: $(srcdir)/libsystemd.sym -at.subdirs += libsystemd-internal libsystemd-journal-internal +at.subdirs += src systemd.sed_files += libsystemd.pc include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/libsystemd-journal-internal/gcrypt-util.c b/src/libsystemd/libsystemd-journal-internal/gcrypt-util.c deleted file mode 120000 index 79dc82a466..0000000000 --- a/src/libsystemd/libsystemd-journal-internal/gcrypt-util.c +++ /dev/null @@ -1 +0,0 @@ -../../libshared/gcrypt-util.c
\ No newline at end of file diff --git a/src/libsystemd/libsystemd-journal-internal/gcrypt-util.h b/src/libsystemd/libsystemd-journal-internal/gcrypt-util.h deleted file mode 120000 index 6da58160eb..0000000000 --- a/src/libsystemd/libsystemd-journal-internal/gcrypt-util.h +++ /dev/null @@ -1 +0,0 @@ -../../libshared/gcrypt-util.h
\ No newline at end of file diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile index 38c7d3a64f..44bf110437 100644 --- a/src/libsystemd/src/Makefile +++ b/src/libsystemd/src/Makefile @@ -23,17 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -audit_list_includes = -include linux/audit.h -include $(topsrcdir)/src/libbasic/missing.h -ifneq ($(HAVE_AUDIT),) -audit_list_includes += -include libaudit.h -endif # HAVE_AUDIT - -$(outdir)/audit_type-list.txt: $(call at.path,$(topsrcdir)/src/libbasic/missing.h) - $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM $(audit_list_includes) - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@ - -$(outdir)/audit_type-to-name.h: $(outdir)/audit_type-list.txt - $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf " case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print " default: return NULL;\n\t}\n}\n" }' <$< >$@ - _libsystemd_internal_la_SOURCES = \ src/systemd/sd-bus.h \ src/systemd/sd-bus-protocol.h \ @@ -103,6 +92,8 @@ _libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-netlink/netlink-types.c \ src/libsystemd/sd-netlink/netlink-util.h \ src/libsystemd/sd-netlink/netlink-util.c \ + src/libsystemd/sd-netlink/local-addresses.h \ + src/libsystemd/sd-netlink/local-addresses.c \ src/libsystemd/sd-id128/sd-id128.c \ src/libsystemd/sd-daemon/sd-daemon.c \ src/libsystemd/sd-login/sd-login.c \ @@ -327,16 +318,16 @@ libsystemd_journal_internal_la_CFLAGS += \ -Wno-pointer-arith endif # HAVE_GCRYPT -noinst_LTLIBRARIES += \ +_noinst_LTLIBRARIES += \ libsystemd-journal-internal.la -systemd.CPPFLAGS += $(libbasic.CPPFLAGS) -systemd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" -$(outdir)/audit-type.lo: $(outdir)/audit_type-to-name.h +libsystemd_internal_la_CFLAGS += $(libsystemd_journal_internal_la_CFLAGS) +libsystemd_internal_la_LIBADD += $(libsystemd_journal_internal_la_LIBADD) +libsystemd_internal_la_LDADD += $(libsystemd_journal_internal_la_LDADD) libsystemd-internal.la.SOURCES = -libsystemd-internal.la.SOURCES += $(patsubst src/libsystemd/%,src/%,$(filter %.c,$(_libsystemd_internal_la_SOURCES))) -libsystemd-internal.la.SOURCES += $(addprefix src/sd-journal/,$(notdir $(filter %.c,$(_libsystemd_journal_internal_la_SOURCES)))) +libsystemd-internal.la.SOURCES += $(patsubst src/libsystemd/%,%,$(filter %.c,$(_libsystemd_internal_la_SOURCES))) +libsystemd-internal.la.SOURCES += $(addprefix sd-journal/,$(notdir $(filter %.c,$(_libsystemd_journal_internal_la_SOURCES)))) libsystemd-internal.la.DEPENDS = $(addprefix $(outdir)/,$(libsystemd-internal.la.SOURCES:.c=.lo)) at.subdirs += $(sort $(dir $(libsystemd-internal.la.SOURCES))) diff --git a/src/libsystemd/libsystemd-internal/sd-bus/Makefile b/src/libsystemd/src/sd-bus/Makefile index 71a1159ce0..71a1159ce0 120000 --- a/src/libsystemd/libsystemd-internal/sd-bus/Makefile +++ b/src/libsystemd/src/sd-bus/Makefile diff --git a/src/libsystemd/libsystemd-internal/sd-daemon/Makefile b/src/libsystemd/src/sd-daemon/Makefile index 71a1159ce0..71a1159ce0 120000 --- a/src/libsystemd/libsystemd-internal/sd-daemon/Makefile +++ b/src/libsystemd/src/sd-daemon/Makefile diff --git a/src/libsystemd/libsystemd-internal/sd-device/Makefile b/src/libsystemd/src/sd-device/Makefile index 71a1159ce0..71a1159ce0 120000 --- a/src/libsystemd/libsystemd-internal/sd-device/Makefile +++ b/src/libsystemd/src/sd-device/Makefile diff --git a/src/libsystemd/libsystemd-internal/sd-event/Makefile b/src/libsystemd/src/sd-event/Makefile index 71a1159ce0..71a1159ce0 120000 --- a/src/libsystemd/libsystemd-internal/sd-event/Makefile +++ b/src/libsystemd/src/sd-event/Makefile diff --git a/src/libsystemd/libsystemd-internal/sd-hwdb/Makefile b/src/libsystemd/src/sd-hwdb/Makefile index 71a1159ce0..71a1159ce0 120000 --- a/src/libsystemd/libsystemd-internal/sd-hwdb/Makefile +++ b/src/libsystemd/src/sd-hwdb/Makefile diff --git a/src/libsystemd/libsystemd-internal/sd-id128/Makefile b/src/libsystemd/src/sd-id128/Makefile index 71a1159ce0..71a1159ce0 120000 --- a/src/libsystemd/libsystemd-internal/sd-id128/Makefile +++ b/src/libsystemd/src/sd-id128/Makefile diff --git a/src/libsystemd/src/sd-journal/Makefile b/src/libsystemd/src/sd-journal/Makefile new file mode 100644 index 0000000000..7f1caf0836 --- /dev/null +++ b/src/libsystemd/src/sd-journal/Makefile @@ -0,0 +1,42 @@ +# -*- Mode: makefile; indent-tabs-mode: t -*- +# +# This file is part of systemd. +# +# Copyright 2010-2012 Lennart Poettering +# Copyright 2010-2012 Kay Sievers +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# Copyright 2013 David Strauss +# Copyright 2016 Luke Shumaker +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. + +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk +include $(topsrcdir)/build-aux/Makefile.head.mk + +audit_list_includes = -include linux/audit.h -include $(topsrcdir)/src/libbasic/missing.h +ifneq ($(HAVE_AUDIT),) +audit_list_includes += -include libaudit.h +endif # HAVE_AUDIT + +$(outdir)/audit_type-list.txt: $(call at.path,$(topsrcdir)/src/libbasic/missing.h) + $(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM $(audit_list_includes) - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@ + +$(outdir)/audit_type-to-name.h: $(outdir)/audit_type-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf " case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print " default: return NULL;\n\t}\n}\n" }' <$< >$@ + +systemd.CPPFLAGS += $(libbasic.CPPFLAGS) +systemd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" +$(outdir)/audit-type.lo: $(outdir)/audit_type-to-name.h + +include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libsystemd/src/sd-journal/gcrypt-util.c b/src/libsystemd/src/sd-journal/gcrypt-util.c new file mode 120000 index 0000000000..2bd8bde8da --- /dev/null +++ b/src/libsystemd/src/sd-journal/gcrypt-util.c @@ -0,0 +1 @@ +../../../libshared/gcrypt-util.c
\ No newline at end of file diff --git a/src/libsystemd/src/sd-journal/gcrypt-util.h b/src/libsystemd/src/sd-journal/gcrypt-util.h new file mode 120000 index 0000000000..6de2527ac8 --- /dev/null +++ b/src/libsystemd/src/sd-journal/gcrypt-util.h @@ -0,0 +1 @@ +../../../libshared/gcrypt-util.h
\ No newline at end of file diff --git a/src/libsystemd/libsystemd-internal/sd-login/Makefile b/src/libsystemd/src/sd-login/Makefile index 71a1159ce0..71a1159ce0 120000 --- a/src/libsystemd/libsystemd-internal/sd-login/Makefile +++ b/src/libsystemd/src/sd-login/Makefile diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/Makefile b/src/libsystemd/src/sd-netlink/Makefile index 71a1159ce0..71a1159ce0 120000 --- a/src/libsystemd/libsystemd-internal/sd-netlink/Makefile +++ b/src/libsystemd/src/sd-netlink/Makefile diff --git a/src/libsystemd/libsystemd-internal/sd-network/Makefile b/src/libsystemd/src/sd-network/Makefile index 71a1159ce0..71a1159ce0 120000 --- a/src/libsystemd/libsystemd-internal/sd-network/Makefile +++ b/src/libsystemd/src/sd-network/Makefile diff --git a/src/libsystemd/libsystemd-internal/sd-path/Makefile b/src/libsystemd/src/sd-path/Makefile index 71a1159ce0..71a1159ce0 120000 --- a/src/libsystemd/libsystemd-internal/sd-path/Makefile +++ b/src/libsystemd/src/sd-path/Makefile diff --git a/src/libsystemd/libsystemd-internal/sd-resolve/Makefile b/src/libsystemd/src/sd-resolve/Makefile index 71a1159ce0..71a1159ce0 120000 --- a/src/libsystemd/libsystemd-internal/sd-resolve/Makefile +++ b/src/libsystemd/src/sd-resolve/Makefile diff --git a/src/libsystemd/libsystemd-internal/sd-utf8/Makefile b/src/libsystemd/src/sd-utf8/Makefile index 71a1159ce0..71a1159ce0 120000 --- a/src/libsystemd/libsystemd-internal/sd-utf8/Makefile +++ b/src/libsystemd/src/sd-utf8/Makefile diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile index 6628ec6253..77fc1fe6aa 100644 --- a/src/libudev/src/Makefile +++ b/src/libudev/src/Makefile @@ -80,8 +80,6 @@ test_libudev_sym_CFLAGS = \ test_libudev_sym_LDADD = \ libudev.la -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-device -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb systemd.sed_files += libudev.pc include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/libudev/src/libudev-device-private.c b/src/libudev/src/libudev-device-private.c index 2aae0726c1..bd18d60c1e 100644 --- a/src/libudev/src/libudev-device-private.c +++ b/src/libudev/src/libudev-device-private.c @@ -20,7 +20,7 @@ #include "libudev.h" -#include "device-private.h" +#include "sd-device/device-private.h" #include "libudev-device-internal.h" #include "libudev-private.h" diff --git a/src/libudev/src/libudev-device.c b/src/libudev/src/libudev-device.c index 6536f4cfbb..6bf2e87189 100644 --- a/src/libudev/src/libudev-device.c +++ b/src/libudev/src/libudev-device.c @@ -38,8 +38,8 @@ #include <systemd/sd-device.h> #include "alloc-util.h" -#include "device-private.h" -#include "device-util.h" +#include "sd-device/device-private.h" +#include "sd-device/device-util.h" #include "libudev-device-internal.h" #include "libudev-private.h" #include "parse-util.h" diff --git a/src/libudev/src/libudev-enumerate.c b/src/libudev/src/libudev-enumerate.c index 9910cea957..ad6b3a9778 100644 --- a/src/libudev/src/libudev-enumerate.c +++ b/src/libudev/src/libudev-enumerate.c @@ -32,8 +32,8 @@ #include <systemd/sd-device.h> #include "alloc-util.h" -#include "device-enumerator-private.h" -#include "device-util.h" +#include "sd-device/device-enumerator-private.h" +#include "sd-device/device-util.h" #include "libudev-device-internal.h" /** diff --git a/src/libudev/src/libudev-hwdb.c b/src/libudev/src/libudev-hwdb.c index 8c4b488086..d671484156 100644 --- a/src/libudev/src/libudev-hwdb.c +++ b/src/libudev/src/libudev-hwdb.c @@ -20,7 +20,7 @@ #include <systemd/sd-hwdb.h> #include "alloc-util.h" -#include "hwdb-util.h" +#include "sd-hwdb/hwdb-util.h" #include "libudev-private.h" /** diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c index 2b83d127b7..00322c8353 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c @@ -26,7 +26,7 @@ #include "alloc-util.h" #include "hostname-util.h" -#include "local-addresses.h" +#include "sd-netlink/local-addresses.h" #include "macro.h" #include "nss-util.h" #include "signal-util.h" diff --git a/src/systemd-analyze/analyze-verify.c b/src/systemd-analyze/analyze-verify.c index 5fd3ee49eb..5616947f9b 100644 --- a/src/systemd-analyze/analyze-verify.c +++ b/src/systemd-analyze/analyze-verify.c @@ -21,7 +21,7 @@ #include "alloc-util.h" #include "analyze-verify.h" -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" #include "log.h" #include "manager.h" diff --git a/src/systemd-analyze/analyze.c b/src/systemd-analyze/analyze.c index 0e1eee16ec..c3d36c04c7 100644 --- a/src/systemd-analyze/analyze.c +++ b/src/systemd-analyze/analyze.c @@ -27,7 +27,7 @@ #include "alloc-util.h" #include "analyze-verify.h" -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-unit-util.h" #include "bus-util.h" #include "glob-util.h" diff --git a/src/systemd-cgls/cgls.c b/src/systemd-cgls/cgls.c index ed2846ee57..640383cbb6 100644 --- a/src/systemd-cgls/cgls.c +++ b/src/systemd-cgls/cgls.c @@ -26,7 +26,7 @@ #include <systemd/sd-bus.h> #include "alloc-util.h" -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" #include "cgroup-show.h" #include "cgroup-util.h" diff --git a/src/systemd-cgtop/cgtop.c b/src/systemd-cgtop/cgtop.c index 6cbea86070..65497a1275 100644 --- a/src/systemd-cgtop/cgtop.c +++ b/src/systemd-cgtop/cgtop.c @@ -29,7 +29,7 @@ #include <systemd/sd-bus.h> #include "alloc-util.h" -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" #include "cgroup-util.h" #include "fd-util.h" diff --git a/src/systemd-cryptsetup/Makefile b/src/systemd-cryptsetup/Makefile index ccfa2f40ac..116ffbc664 100644 --- a/src/systemd-cryptsetup/Makefile +++ b/src/systemd-cryptsetup/Makefile @@ -56,7 +56,6 @@ SYSINIT_TARGET_WANTS += \ endif # HAVE_LIBCRYPTSETUP -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-device systemd.CPPFLAGS += -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-cryptsetup/cryptsetup.c b/src/systemd-cryptsetup/cryptsetup.c index 8024f80e36..cb889965f3 100644 --- a/src/systemd-cryptsetup/cryptsetup.c +++ b/src/systemd-cryptsetup/cryptsetup.c @@ -27,7 +27,7 @@ #include "alloc-util.h" #include "ask-password-api.h" -#include "device-util.h" +#include "sd-device/device-util.h" #include "escape.h" #include "fileio.h" #include "log.h" diff --git a/src/systemd-dbus1-generator/dbus1-generator.c b/src/systemd-dbus1-generator/dbus1-generator.c index 717cb9558e..1fd6ee4f39 100644 --- a/src/systemd-dbus1-generator/dbus1-generator.c +++ b/src/systemd-dbus1-generator/dbus1-generator.c @@ -18,7 +18,7 @@ ***/ #include "alloc-util.h" -#include "bus-internal.h" +#include "sd-bus/bus-internal.h" #include "bus-util.h" #include "cgroup-util.h" #include "conf-parser.h" diff --git a/src/systemd-fsck/Makefile b/src/systemd-fsck/Makefile index 96537a0898..cc4e21055c 100644 --- a/src/systemd-fsck/Makefile +++ b/src/systemd-fsck/Makefile @@ -30,6 +30,4 @@ systemd_fsck_SOURCES = \ systemd_fsck_LDADD = \ libshared.la -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-device - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-fsck/fsck.c b/src/systemd-fsck/fsck.c index d7f0829ffc..be5551f124 100644 --- a/src/systemd-fsck/fsck.c +++ b/src/systemd-fsck/fsck.c @@ -31,10 +31,10 @@ #include <systemd/sd-device.h> #include "alloc-util.h" -#include "bus-common-errors.h" -#include "bus-error.h" +#include "sd-bus/bus-common-errors.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" -#include "device-util.h" +#include "sd-device/device-util.h" #include "fd-util.h" #include "fs-util.h" #include "parse-util.h" diff --git a/src/systemd-hwdb/Makefile b/src/systemd-hwdb/Makefile index 7c64c801ca..bf14199ffe 100644 --- a/src/systemd-hwdb/Makefile +++ b/src/systemd-hwdb/Makefile @@ -73,7 +73,6 @@ EXTRA_DIST += \ hwdb/ids-update.pl \ hwdb/sdio.ids -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-hwdb systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-hwdb/hwdb.c b/src/systemd-hwdb/hwdb.c index 1160dacdf1..e29172a26a 100644 --- a/src/systemd-hwdb/hwdb.c +++ b/src/systemd-hwdb/hwdb.c @@ -27,8 +27,8 @@ #include "fd-util.h" #include "fileio.h" #include "fs-util.h" -#include "hwdb-internal.h" -#include "hwdb-util.h" +#include "sd-hwdb/hwdb-internal.h" +#include "sd-hwdb/hwdb-util.h" #include "mkdir.h" #include "strbuf.h" #include "string-util.h" diff --git a/src/systemd-initctl/Makefile b/src/systemd-initctl/Makefile index ae4151a081..bd19b4a090 100644 --- a/src/systemd-initctl/Makefile +++ b/src/systemd-initctl/Makefile @@ -30,6 +30,4 @@ systemd_initctl_SOURCES = \ systemd_initctl_LDADD = \ libshared.la -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-initctl/initctl.c b/src/systemd-initctl/initctl.c index 05285e3846..01423d5701 100644 --- a/src/systemd-initctl/initctl.c +++ b/src/systemd-initctl/initctl.c @@ -27,7 +27,7 @@ #include <systemd/sd-daemon.h> #include "alloc-util.h" -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" #include "def.h" #include "fd-util.h" diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index 5d6fcfdc5a..8ea5967add 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -82,7 +82,6 @@ test_patch_uid_LDADD = \ manual_tests += \ test-patch-uid -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus systemd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c index 71eb88873c..56afe930ac 100644 --- a/src/systemd-nspawn/nspawn-expose-ports.c +++ b/src/systemd-nspawn/nspawn-expose-ports.c @@ -23,7 +23,7 @@ #include "fd-util.h" #include "firewall-util.h" #include "in-addr-util.h" -#include "local-addresses.h" +#include "sd-netlink/local-addresses.h" #include "nspawn-expose-ports.h" #include "parse-util.h" #include "socket-util.h" diff --git a/src/systemd-nspawn/nspawn-register.c b/src/systemd-nspawn/nspawn-register.c index 08cbff9731..02359ca773 100644 --- a/src/systemd-nspawn/nspawn-register.c +++ b/src/systemd-nspawn/nspawn-register.c @@ -19,7 +19,7 @@ #include <systemd/sd-bus.h> -#include "bus-error.h" /* for bus_error_message */ +#include "sd-bus/bus-error.h" /* for bus_error_message */ #include "bus-unit-util.h" #include "bus-util.h" #include "nspawn-register.h" diff --git a/src/systemd-run/run.c b/src/systemd-run/run.c index 29b5131f70..94cc865672 100644 --- a/src/systemd-run/run.c +++ b/src/systemd-run/run.c @@ -24,7 +24,7 @@ #include <systemd/sd-event.h> #include "alloc-util.h" -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-unit-util.h" #include "bus-util.h" #include "calendarspec.h" diff --git a/src/systemd-stdio-bridge/stdio-bridge.c b/src/systemd-stdio-bridge/stdio-bridge.c index dce959cae3..d2e75c0679 100644 --- a/src/systemd-stdio-bridge/stdio-bridge.c +++ b/src/systemd-stdio-bridge/stdio-bridge.c @@ -27,7 +27,7 @@ #include <systemd/sd-bus.h> #include <systemd/sd-daemon.h> -#include "bus-internal.h" +#include "sd-bus/bus-internal.h" #include "bus-util.h" #include "build.h" #include "log.h" diff --git a/src/systemd-timesyncd/Makefile b/src/systemd-timesyncd/Makefile index ad037c3625..50333d0380 100644 --- a/src/systemd-timesyncd/Makefile +++ b/src/systemd-timesyncd/Makefile @@ -61,7 +61,6 @@ EXTRA_DIST += \ units/systemd-timesyncd.service.in \ src/timesync/timesyncd.conf.in -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-network systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-timesyncd/timesyncd-manager.c b/src/systemd-timesyncd/timesyncd-manager.c index 6a4b52af69..e1626ac19b 100644 --- a/src/systemd-timesyncd/timesyncd-manager.c +++ b/src/systemd-timesyncd/timesyncd-manager.c @@ -37,7 +37,7 @@ #include "list.h" #include "log.h" #include "missing.h" -#include "network-util.h" +#include "sd-network/network-util.h" #include "ratelimit.h" #include "socket-util.h" #include "sparse-endian.h" diff --git a/src/systemd-timesyncd/timesyncd.c b/src/systemd-timesyncd/timesyncd.c index 9e538a82f2..023372fef0 100644 --- a/src/systemd-timesyncd/timesyncd.c +++ b/src/systemd-timesyncd/timesyncd.c @@ -24,7 +24,7 @@ #include "clock-util.h" #include "fd-util.h" #include "fs-util.h" -#include "network-util.h" +#include "sd-network/network-util.h" #include "signal-util.h" #include "timesyncd-conf.h" #include "timesyncd-manager.h" diff --git a/src/systemd-update-utmp/update-utmp.c b/src/systemd-update-utmp/update-utmp.c index fedcaef91c..2ccdfd7e9d 100644 --- a/src/systemd-update-utmp/update-utmp.c +++ b/src/systemd-update-utmp/update-utmp.c @@ -28,7 +28,7 @@ #include <systemd/sd-bus.h> #include "alloc-util.h" -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" #include "formats-util.h" #include "log.h" |