diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-27 15:32:35 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-27 15:32:35 -0400 |
commit | 658d4fefc78a50ad825f95f55f640a2a97134f80 (patch) | |
tree | a46e63faa481178532d2ebecb53d31b00e3654ca /src | |
parent | 3f88c40b91e52978fdb9efcf684a6a2b62afb509 (diff) |
stuff
Diffstat (limited to 'src')
-rw-r--r-- | src/journal/Makefile | 72 | ||||
-rw-r--r-- | src/libbasic/Makefile | 45 | ||||
-rw-r--r-- | src/libfirewall/Makefile | 19 | ||||
-rw-r--r-- | src/libshared/Makefile | 2 | ||||
-rw-r--r-- | src/libsystemd/.gitignore (renamed from src/libsystemd/src/.gitignore) | 0 | ||||
-rw-r--r-- | src/libsystemd/Makefile (renamed from src/libsystemd/src/Makefile) | 103 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/Makefile | 131 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/DIFFERENCES (renamed from src/libsystemd/src/sd-bus/DIFFERENCES) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/GVARIANT-SERIALIZATION (renamed from src/libsystemd/src/sd-bus/GVARIANT-SERIALIZATION) | 0 | ||||
l--------- | src/libsystemd/libsystemd-internal/sd-bus/Makefile | 1 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/PORTING-DBUS1 (renamed from src/libsystemd/src/sd-bus/PORTING-DBUS1) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.c (renamed from src/libsystemd/src/sd-bus/bus-bloom.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.h (renamed from src/libsystemd/src/sd-bus/bus-bloom.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.c (renamed from src/libsystemd/src/sd-bus/bus-common-errors.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.h (renamed from src/libsystemd/src/sd-bus/bus-common-errors.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-container.c (renamed from src/libsystemd/src/sd-bus/bus-container.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-container.h (renamed from src/libsystemd/src/sd-bus/bus-container.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-control.c (renamed from src/libsystemd/src/sd-bus/bus-control.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-control.h (renamed from src/libsystemd/src/sd-bus/bus-control.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-convenience.c (renamed from src/libsystemd/src/sd-bus/bus-convenience.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-creds.c (renamed from src/libsystemd/src/sd-bus/bus-creds.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-creds.h (renamed from src/libsystemd/src/sd-bus/bus-creds.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-dump.c (renamed from src/libsystemd/src/sd-bus/bus-dump.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-dump.h (renamed from src/libsystemd/src/sd-bus/bus-dump.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-error.c (renamed from src/libsystemd/src/sd-bus/bus-error.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-error.h (renamed from src/libsystemd/src/sd-bus/bus-error.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.c (renamed from src/libsystemd/src/sd-bus/bus-gvariant.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.h (renamed from src/libsystemd/src/sd-bus/bus-gvariant.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-internal.c (renamed from src/libsystemd/src/sd-bus/bus-internal.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-internal.h (renamed from src/libsystemd/src/sd-bus/bus-internal.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.c (renamed from src/libsystemd/src/sd-bus/bus-introspect.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.h (renamed from src/libsystemd/src/sd-bus/bus-introspect.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.c (renamed from src/libsystemd/src/sd-bus/bus-kernel.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.h (renamed from src/libsystemd/src/sd-bus/bus-kernel.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-match.c (renamed from src/libsystemd/src/sd-bus/bus-match.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-match.h (renamed from src/libsystemd/src/sd-bus/bus-match.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-message.c (renamed from src/libsystemd/src/sd-bus/bus-message.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-message.h (renamed from src/libsystemd/src/sd-bus/bus-message.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-objects.c (renamed from src/libsystemd/src/sd-bus/bus-objects.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-objects.h (renamed from src/libsystemd/src/sd-bus/bus-objects.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-protocol.h (renamed from src/libsystemd/src/sd-bus/bus-protocol.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-signature.c (renamed from src/libsystemd/src/sd-bus/bus-signature.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-signature.h (renamed from src/libsystemd/src/sd-bus/bus-signature.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-slot.c (renamed from src/libsystemd/src/sd-bus/bus-slot.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-slot.h (renamed from src/libsystemd/src/sd-bus/bus-slot.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-socket.c (renamed from src/libsystemd/src/sd-bus/bus-socket.c) | 4 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-socket.h (renamed from src/libsystemd/src/sd-bus/bus-socket.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-track.c (renamed from src/libsystemd/src/sd-bus/bus-track.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-track.h (renamed from src/libsystemd/src/sd-bus/bus-track.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-type.c (renamed from src/libsystemd/src/sd-bus/bus-type.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/bus-type.h (renamed from src/libsystemd/src/sd-bus/bus-type.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.c (renamed from src/libsystemd/src/sd-bus/busctl-introspect.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.h (renamed from src/libsystemd/src/sd-bus/busctl-introspect.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/busctl.c (renamed from src/libsystemd/src/sd-bus/busctl.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/kdbus.h (renamed from src/libsystemd/src/sd-bus/kdbus.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/sd-bus.c (renamed from src/libsystemd/src/sd-bus/sd-bus.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-benchmark.c (renamed from src/libsystemd/src/sd-bus/test-bus-benchmark.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-chat.c (renamed from src/libsystemd/src/sd-bus/test-bus-chat.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-cleanup.c (renamed from src/libsystemd/src/sd-bus/test-bus-cleanup.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-creds.c (renamed from src/libsystemd/src/sd-bus/test-bus-creds.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-error.c (renamed from src/libsystemd/src/sd-bus/test-bus-error.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-gvariant.c (renamed from src/libsystemd/src/sd-bus/test-bus-gvariant.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-introspect.c (renamed from src/libsystemd/src/sd-bus/test-bus-introspect.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel-bloom.c (renamed from src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel.c (renamed from src/libsystemd/src/sd-bus/test-bus-kernel.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-marshal.c (renamed from src/libsystemd/src/sd-bus/test-bus-marshal.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-match.c (renamed from src/libsystemd/src/sd-bus/test-bus-match.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-objects.c (renamed from src/libsystemd/src/sd-bus/test-bus-objects.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-proxy.c (renamed from src/libsystemd/src/sd-bus/test-bus-proxy.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-server.c (renamed from src/libsystemd/src/sd-bus/test-bus-server.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-signature.c (renamed from src/libsystemd/src/sd-bus/test-bus-signature.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-bus/test-bus-zero-copy.c (renamed from src/libsystemd/src/sd-bus/test-bus-zero-copy.c) | 2 | ||||
l--------- | src/libsystemd/libsystemd-internal/sd-daemon/Makefile | 1 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-daemon/sd-daemon.c (renamed from src/libsystemd/src/sd-daemon/sd-daemon.c) | 2 | ||||
l--------- | src/libsystemd/libsystemd-internal/sd-device/Makefile | 1 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-device/device-enumerator-private.h (renamed from src/libsystemd/src/sd-device/device-enumerator-private.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-device/device-enumerator.c (renamed from src/libsystemd/src/sd-device/device-enumerator.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-device/device-internal.h (renamed from src/libsystemd/src/sd-device/device-internal.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-device/device-private.c (renamed from src/libsystemd/src/sd-device/device-private.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-device/device-private.h (renamed from src/libsystemd/src/sd-device/device-private.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-device/device-util.h (renamed from src/libsystemd/src/sd-device/device-util.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-device/sd-device.c (renamed from src/libsystemd/src/sd-device/sd-device.c) | 2 | ||||
l--------- | src/libsystemd/libsystemd-internal/sd-event/Makefile | 1 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-event/sd-event.c (renamed from src/libsystemd/src/sd-event/sd-event.c) | 6 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-event/test-event.c (renamed from src/libsystemd/src/sd-event/test-event.c) | 2 | ||||
l--------- | src/libsystemd/libsystemd-internal/sd-hwdb/Makefile | 1 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-internal.h (renamed from src/libsystemd/src/sd-hwdb/hwdb-internal.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-util.h (renamed from src/libsystemd/src/sd-hwdb/hwdb-util.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-hwdb/sd-hwdb.c (renamed from src/libsystemd/src/sd-hwdb/sd-hwdb.c) | 2 | ||||
l--------- | src/libsystemd/libsystemd-internal/sd-id128/Makefile | 1 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-id128/sd-id128.c (renamed from src/libsystemd/src/sd-id128/sd-id128.c) | 2 | ||||
l--------- | src/libsystemd/libsystemd-internal/sd-login/Makefile | 1 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-login/sd-login.c (renamed from src/libsystemd/src/sd-login/sd-login.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-login/test-login.c (renamed from src/libsystemd/src/sd-login/test-login.c) | 2 | ||||
l--------- | src/libsystemd/libsystemd-internal/sd-netlink/Makefile | 1 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c (renamed from src/libsystemd/src/sd-netlink/local-addresses.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.h (renamed from src/libsystemd/src/sd-netlink/local-addresses.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/netlink-internal.h (renamed from src/libsystemd/src/sd-netlink/netlink-internal.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/netlink-message.c (renamed from src/libsystemd/src/sd-netlink/netlink-message.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/netlink-socket.c (renamed from src/libsystemd/src/sd-netlink/netlink-socket.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.c (renamed from src/libsystemd/src/sd-netlink/netlink-types.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.h (renamed from src/libsystemd/src/sd-netlink/netlink-types.h) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.c (renamed from src/libsystemd/src/sd-netlink/netlink-util.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.h (renamed from src/libsystemd/src/sd-netlink/netlink-util.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/rtnl-message.c (renamed from src/libsystemd/src/sd-netlink/rtnl-message.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/sd-netlink.c (renamed from src/libsystemd/src/sd-netlink/sd-netlink.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/test-local-addresses.c (renamed from src/libsystemd/src/sd-netlink/test-local-addresses.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-netlink/test-netlink.c (renamed from src/libsystemd/src/sd-netlink/test-netlink.c) | 2 | ||||
l--------- | src/libsystemd/libsystemd-internal/sd-network/Makefile | 1 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-network/network-util.c (renamed from src/libsystemd/src/sd-network/network-util.c) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-network/network-util.h (renamed from src/libsystemd/src/sd-network/network-util.h) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-network/sd-network.c (renamed from src/libsystemd/src/sd-network/sd-network.c) | 2 | ||||
l--------- | src/libsystemd/libsystemd-internal/sd-path/Makefile | 1 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-path/sd-path.c (renamed from src/libsystemd/src/sd-path/sd-path.c) | 2 | ||||
l--------- | src/libsystemd/libsystemd-internal/sd-resolve/Makefile | 1 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-resolve/sd-resolve.c (renamed from src/libsystemd/src/sd-resolve/sd-resolve.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-resolve/test-resolve.c (renamed from src/libsystemd/src/sd-resolve/test-resolve.c) | 2 | ||||
l--------- | src/libsystemd/libsystemd-internal/sd-utf8/Makefile | 1 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/sd-utf8/sd-utf8.c (renamed from src/libsystemd/src/sd-utf8/sd-utf8.c) | 2 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-internal/subdir.mk | 7 | ||||
-rw-r--r-- | src/libsystemd/libsystemd-journal-internal/Makefile | 71 | ||||
-rw-r--r-- | src/libsystemd/libsystemd.pc.in (renamed from src/libsystemd/src/libsystemd.pc.in) | 0 | ||||
-rw-r--r-- | src/libsystemd/libsystemd.sym (renamed from src/libsystemd/src/libsystemd.sym) | 0 | ||||
-rw-r--r-- | src/systemd-nspawn/Makefile | 45 | ||||
-rw-r--r-- | src/systemd-nspawn/nspawn-expose-ports.c | 2 | ||||
-rw-r--r-- | src/udev/udev.h | 4 |
126 files changed, 332 insertions, 317 deletions
diff --git a/src/journal/Makefile b/src/journal/Makefile index 1d843f1524..dc58b8c1a6 100644 --- a/src/journal/Makefile +++ b/src/journal/Makefile @@ -259,78 +259,6 @@ tests += \ test-compress-benchmark endif -pkginclude_HEADERS += \ - src/systemd/sd-journal.h \ - src/systemd/sd-messages.h \ - src/systemd/_sd-common.h - -libsystemd_journal_internal_la_SOURCES = \ - src/journal/sd-journal.c \ - src/systemd/sd-journal.h \ - src/systemd/_sd-common.h \ - src/journal/journal-file.c \ - src/journal/journal-file.h \ - src/journal/journal-vacuum.c \ - src/journal/journal-vacuum.h \ - src/journal/journal-verify.c \ - src/journal/journal-verify.h \ - src/journal/lookup3.c \ - src/journal/lookup3.h \ - src/journal/journal-send.c \ - src/journal/journal-def.h \ - src/journal/compress.h \ - src/journal/catalog.c \ - src/journal/catalog.h \ - src/journal/mmap-cache.c \ - src/journal/mmap-cache.h \ - src/journal/compress.c \ - src/journal/audit-type.h \ - src/journal/audit-type.c - -nodist_libsystemd_journal_internal_la_SOURCES = \ - src/journal/audit_type-to-name.h - -gperf_txt_sources += \ - src/journal/audit_type-list.txt - -# using _CFLAGS = in the conditional below would suppress AM_CFLAGS -libsystemd_journal_internal_la_CFLAGS = \ - $(AM_CFLAGS) - -libsystemd_journal_internal_la_LIBADD = - -ifneq ($(HAVE_XZ),) -libsystemd_journal_internal_la_CFLAGS += \ - $(XZ_CFLAGS) - -libsystemd_journal_internal_la_LIBADD += \ - $(XZ_LIBS) -endif - -ifneq ($(HAVE_LZ4),) -libsystemd_journal_internal_la_LIBADD += \ - -llz4 -endif - -ifneq ($(HAVE_GCRYPT),) -libsystemd_journal_internal_la_SOURCES += \ - src/journal/journal-authenticate.c \ - src/journal/journal-authenticate.h \ - src/journal/fsprg.c \ - src/journal/fsprg.h - -libsystemd_journal_internal_la_LIBADD += \ - $(GCRYPT_LIBS) - -# fsprg.c is a drop-in file using void pointer arithmetic -libsystemd_journal_internal_la_CFLAGS += \ - $(GCRYPT_CFLAGS) \ - -Wno-pointer-arith -endif - -noinst_LTLIBRARIES += \ - libsystemd-journal-internal.la - rootlibexec_PROGRAMS += \ systemd-journald diff --git a/src/libbasic/Makefile b/src/libbasic/Makefile index c115b2fe8e..de5da89a24 100644 --- a/src/libbasic/Makefile +++ b/src/libbasic/Makefile @@ -23,9 +23,6 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk include $(topsrcdir)/automake.head.mk -noinst_LTLIBRARIES += \ - libbasic.la - libbasic_la_SOURCES = \ src/basic/missing.h \ src/basic/capability-util.c \ @@ -219,34 +216,14 @@ libbasic_la_SOURCES = \ src/basic/formats-util.h \ src/basic/nss-util.h -nodist_libbasic_la_SOURCES = \ - src/basic/errno-from-name.h \ - src/basic/errno-to-name.h \ - src/basic/af-from-name.h \ - src/basic/af-to-name.h \ - src/basic/arphrd-from-name.h \ - src/basic/arphrd-to-name.h \ - src/basic/cap-from-name.h \ - src/basic/cap-to-name.h - -libbasic_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(SELINUX_CFLAGS) \ - $(CAP_CFLAGS) \ - -pthread - -libbasic_la_LIBADD = \ - $(SELINUX_LIBS) \ - $(CAP_LIBS) \ - -lrt \ - -lm - am_out_files = libbasic.la -CFLAGS += $(libbasic_la_CFLAGS) -CPPFLAGS += -I$(topsrcdir)/src/libsystemd/include -CPPFLAGS += -I$(topoutdir)/src/libsystemd/include -CPPFLAGS += -include $(topoutdir)/config.h -$(outdir)/libbasic.la: $(patsubst src/basic/%.c,$(outdir)/%.lo,$(filter %.c,$(libbasic_la_SOURCES))) $(libbasic_la_LIBADD) +CFLAGS += -pthread +CPPFLAGS += $(libsystemd.CPPFLAGS) $(libselinux.CPPFLAGS) $(libcap.CPPFLAGS) +$(outdir)/libbasic.la: \ + $(patsubst src/basic/%.c,$(outdir)/%.lo,$(filter %.c,$(libbasic_la_SOURCES))) \ + $(libselinux.DEPENDS) $(libcap.DEPENDS) -lrt -lm + +am_clean_files += *-to-name.h *-from-name.h *-from-name.gperf *-list.txt $(outdir)/af-list.lo: $(outdir)/af-from-name.h $(outdir)/af-to-name.h $(outdir)/arphrd-list.lo: $(outdir)/arphrd-from-name.h $(outdir)/arphrd-to-name.h @@ -254,21 +231,21 @@ $(outdir)/cap-list.lo: $(outdir)/cap-from-name.h $(outdir)/cap-to-name.h $(outdir)/errno-list.lo: $(outdir)/errno-from-name.h $(outdir)/errno-to-name.h $(outdir)/errno-list.txt: - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@ + $(AM_V_GEN)$(CPP) $(CFLAGS) $(CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@ $(outdir)/errno-to-name.h: $(outdir)/errno-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@ $(outdir)/af-list.txt: - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@ + $(AM_V_GEN)$(CPP) $(CFLAGS) $(CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@ $(outdir)/af-to-name.h: $(outdir)/af-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@ $(outdir)/arphrd-list.txt: - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@ + $(AM_V_GEN)$(CPP) $(CFLAGS) $(CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@ $(outdir)/arphrd-to-name.h: $(outdir)/arphrd-list.txt $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -279,7 +256,7 @@ $(outdir)/arphrd-from-name.gperf: $(outdir)/arphrd-list.txt $(outdir)/cap-list.txt: - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@ + $(AM_V_GEN)$(CPP) $(CFLAGS) $(CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@ $(outdir)/cap-to-name.h: $(outdir)/cap-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@ diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile index f0697f1513..c6519157c6 100644 --- a/src/libfirewall/Makefile +++ b/src/libfirewall/Makefile @@ -20,20 +20,11 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -ifneq ($(HAVE_LIBIPTC),) -noinst_LTLIBRARIES += \ - libfirewall.la +include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(topsrcdir)/automake.head.mk -libfirewall_la_SOURCES = \ - src/shared/firewall-util.h \ - src/shared/firewall-util.c - -libfirewall_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(LIBIPTC_CFLAGS) - -libfirewall_la_LIBADD = \ - $(LIBIPTC_LIBS) -endif +am_out_files = libfirewall.la +CPPFLAGS += $(libbasic.CPPFLAGS) $(libiptc.CPPFLAGS) +$(outdir)/libfirewall.la: $(outdir)/firewall-util.lo $(libiptc.DEPENDS) include $(topsrcdir)/automake.tail.mk diff --git a/src/libshared/Makefile b/src/libshared/Makefile index ebaa1a2e33..b2aaf58b2c 100644 --- a/src/libshared/Makefile +++ b/src/libshared/Makefile @@ -147,4 +147,6 @@ CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ $(outdir)/libshared.la: \ $(patsubst src/shared/%.c,$(outdir)/%.lo,$(filter %.c,$(libshared_la_SOURCES))) +$(call amtarget2dir,src/shared,libshared.la) + include $(topsrcdir)/automake.tail.mk diff --git a/src/libsystemd/src/.gitignore b/src/libsystemd/.gitignore index 50a1692374..50a1692374 100644 --- a/src/libsystemd/src/.gitignore +++ b/src/libsystemd/.gitignore diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/Makefile index cf72f9ea95..0c3796b262 100644 --- a/src/libsystemd/src/Makefile +++ b/src/libsystemd/Makefile @@ -20,6 +20,9 @@ # # 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)/automake.head.mk + LIBSYSTEMD_CURRENT=14 LIBSYSTEMD_REVISION=0 LIBSYSTEMD_AGE=14 @@ -42,103 +45,6 @@ LIBSYSTEMD_JOURNAL_CURRENT=11 LIBSYSTEMD_JOURNAL_REVISION=5 LIBSYSTEMD_JOURNAL_AGE=11 -libsystemd_internal_la_SOURCES = \ - src/systemd/sd-bus.h \ - src/systemd/sd-bus-protocol.h \ - src/systemd/sd-bus-vtable.h \ - src/systemd/sd-utf8.h \ - src/systemd/sd-event.h \ - src/systemd/sd-netlink.h \ - src/systemd/sd-resolve.h \ - src/systemd/sd-login.h \ - src/systemd/sd-id128.h \ - src/systemd/sd-daemon.h \ - src/systemd/sd-path.h \ - src/systemd/sd-network.h \ - src/systemd/sd-hwdb.h \ - src/systemd/sd-device.h \ - src/libsystemd/libsystemd.sym \ - 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-common-errors.h \ - src/libsystemd/sd-bus/bus-common-errors.c \ - 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-track.c \ - src/libsystemd/sd-bus/bus-track.h \ - src/libsystemd/sd-bus/bus-slot.c \ - src/libsystemd/sd-bus/bus-slot.h \ - src/libsystemd/sd-bus/bus-protocol.h \ - src/libsystemd/sd-bus/kdbus.h \ - src/libsystemd/sd-bus/bus-dump.c \ - src/libsystemd/sd-bus/bus-dump.h \ - src/libsystemd/sd-utf8/sd-utf8.c \ - src/libsystemd/sd-event/sd-event.c \ - src/libsystemd/sd-netlink/sd-netlink.c \ - src/libsystemd/sd-netlink/netlink-internal.h \ - src/libsystemd/sd-netlink/netlink-message.c \ - src/libsystemd/sd-netlink/netlink-socket.c \ - src/libsystemd/sd-netlink/rtnl-message.c \ - src/libsystemd/sd-netlink/netlink-types.h \ - 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 \ - src/libsystemd/sd-path/sd-path.c \ - src/libsystemd/sd-network/sd-network.c \ - src/libsystemd/sd-network/network-util.h \ - src/libsystemd/sd-network/network-util.c \ - src/libsystemd/sd-hwdb/sd-hwdb.c \ - src/libsystemd/sd-hwdb/hwdb-util.h \ - src/libsystemd/sd-hwdb/hwdb-internal.h \ - src/libsystemd/sd-device/device-internal.h \ - src/libsystemd/sd-device/device-util.h \ - src/libsystemd/sd-device/device-enumerator.c \ - src/libsystemd/sd-device/device-enumerator-private.h \ - src/libsystemd/sd-device/sd-device.c \ - src/libsystemd/sd-device/device-private.c \ - src/libsystemd/sd-device/device-private.h \ - src/libsystemd/sd-resolve/sd-resolve.c - -libsystemd_internal_la_LIBADD = \ - libbasic.la \ - -lresolv - -noinst_LTLIBRARIES += \ - libsystemd-internal.la - EXTRA_DIST += \ src/libsystemd/libsystemd.pc.in \ src/libsystemd/sd-bus/DIFFERENCES \ @@ -188,6 +94,8 @@ pkginclude_HEADERS += \ lib_LTLIBRARIES += \ libsystemd.la +# ------------------------------------------------------------------------------ + tests += \ test-bus-marshal \ test-bus-signature \ @@ -374,3 +282,4 @@ nodist_test_libsystemd_sym_SOURCES = \ test_libsystemd_sym_LDADD = \ libsystemd.la +include $(topsrcdir)/automake.tail.mk diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile new file mode 100644 index 0000000000..9874139a9f --- /dev/null +++ b/src/libsystemd/libsystemd-internal/Makefile @@ -0,0 +1,131 @@ +# -*- 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)/automake.head.mk + +libsystemd_internal_la_SOURCES = \ + src/systemd/sd-bus.h \ + src/systemd/sd-bus-protocol.h \ + src/systemd/sd-bus-vtable.h \ + src/systemd/sd-utf8.h \ + src/systemd/sd-event.h \ + src/systemd/sd-netlink.h \ + src/systemd/sd-resolve.h \ + src/systemd/sd-login.h \ + src/systemd/sd-id128.h \ + src/systemd/sd-daemon.h \ + src/systemd/sd-path.h \ + src/systemd/sd-network.h \ + src/systemd/sd-hwdb.h \ + src/systemd/sd-device.h \ + src/libsystemd/libsystemd.sym \ + 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-common-errors.h \ + src/libsystemd/sd-bus/bus-common-errors.c \ + 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-track.c \ + src/libsystemd/sd-bus/bus-track.h \ + src/libsystemd/sd-bus/bus-slot.c \ + src/libsystemd/sd-bus/bus-slot.h \ + src/libsystemd/sd-bus/bus-protocol.h \ + src/libsystemd/sd-bus/kdbus.h \ + src/libsystemd/sd-bus/bus-dump.c \ + src/libsystemd/sd-bus/bus-dump.h \ + src/libsystemd/sd-utf8/sd-utf8.c \ + src/libsystemd/sd-event/sd-event.c \ + src/libsystemd/sd-netlink/sd-netlink.c \ + src/libsystemd/sd-netlink/netlink-internal.h \ + src/libsystemd/sd-netlink/netlink-message.c \ + src/libsystemd/sd-netlink/netlink-socket.c \ + src/libsystemd/sd-netlink/rtnl-message.c \ + src/libsystemd/sd-netlink/netlink-types.h \ + 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 \ + src/libsystemd/sd-path/sd-path.c \ + src/libsystemd/sd-network/sd-network.c \ + src/libsystemd/sd-network/network-util.h \ + src/libsystemd/sd-network/network-util.c \ + src/libsystemd/sd-hwdb/sd-hwdb.c \ + src/libsystemd/sd-hwdb/hwdb-util.h \ + src/libsystemd/sd-hwdb/hwdb-internal.h \ + src/libsystemd/sd-device/device-internal.h \ + src/libsystemd/sd-device/device-util.h \ + src/libsystemd/sd-device/device-enumerator.c \ + src/libsystemd/sd-device/device-enumerator-private.h \ + src/libsystemd/sd-device/sd-device.c \ + src/libsystemd/sd-device/device-private.c \ + src/libsystemd/sd-device/device-private.h \ + src/libsystemd/sd-resolve/sd-resolve.c + +libsystemd_internal_la_LIBADD = \ + libbasic.la \ + -lresolv + +noinst_LTLIBRARIES += \ + libsystemd-internal.la + +am_out_files += libsystemd-internal.la +CPPFLAGS += $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS) +CPPFLAGS += -DLIBDIR=\"$(libdir)\" -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" +am_subdirs += $(dir $(patsubst src/libsystemd/%.c,$(outdir)/%.lo,$(filter %.c,$(libsystemd_internal_la_SOURCES)))) +$(outdir)/libsystemd-internal.la: \ + $(patsubst src/libsystemd/%.c,$(outdir)/%.lo,$(filter %.c,$(libsystemd_internal_la_SOURCES))) \ + $(libbasic.DEPENDS) -lresolv + +include $(topsrcdir)/automake.tail.mk diff --git a/src/libsystemd/src/sd-bus/DIFFERENCES b/src/libsystemd/libsystemd-internal/sd-bus/DIFFERENCES index db269675a7..db269675a7 100644 --- a/src/libsystemd/src/sd-bus/DIFFERENCES +++ b/src/libsystemd/libsystemd-internal/sd-bus/DIFFERENCES diff --git a/src/libsystemd/src/sd-bus/GVARIANT-SERIALIZATION b/src/libsystemd/libsystemd-internal/sd-bus/GVARIANT-SERIALIZATION index 6aeb11364a..6aeb11364a 100644 --- a/src/libsystemd/src/sd-bus/GVARIANT-SERIALIZATION +++ b/src/libsystemd/libsystemd-internal/sd-bus/GVARIANT-SERIALIZATION diff --git a/src/libsystemd/libsystemd-internal/sd-bus/Makefile b/src/libsystemd/libsystemd-internal/sd-bus/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-bus/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/src/sd-bus/PORTING-DBUS1 b/src/libsystemd/libsystemd-internal/sd-bus/PORTING-DBUS1 index 2dedb28bcf..2dedb28bcf 100644 --- a/src/libsystemd/src/sd-bus/PORTING-DBUS1 +++ b/src/libsystemd/libsystemd-internal/sd-bus/PORTING-DBUS1 diff --git a/src/libsystemd/src/sd-bus/bus-bloom.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.c index 112769fcb6..112769fcb6 100644 --- a/src/libsystemd/src/sd-bus/bus-bloom.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.c diff --git a/src/libsystemd/src/sd-bus/bus-bloom.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.h index c824622b95..c824622b95 100644 --- a/src/libsystemd/src/sd-bus/bus-bloom.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.h diff --git a/src/libsystemd/src/sd-bus/bus-common-errors.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.c index 3c19f2b108..2d8ca47987 100644 --- a/src/libsystemd/src/sd-bus/bus-common-errors.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.c @@ -19,7 +19,7 @@ #include <errno.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-common-errors.h" #include "bus-error.h" diff --git a/src/libsystemd/src/sd-bus/bus-common-errors.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.h index fab8748f46..fab8748f46 100644 --- a/src/libsystemd/src/sd-bus/bus-common-errors.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.h diff --git a/src/libsystemd/src/sd-bus/bus-container.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-container.c index 3191d27ded..3191d27ded 100644 --- a/src/libsystemd/src/sd-bus/bus-container.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-container.c diff --git a/src/libsystemd/src/sd-bus/bus-container.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-container.h index 509ef45624..5cd6d15ede 100644 --- a/src/libsystemd/src/sd-bus/bus-container.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-container.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> int bus_container_connect_socket(sd_bus *b); int bus_container_connect_kernel(sd_bus *b); diff --git a/src/libsystemd/src/sd-bus/bus-control.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-control.c index 05222b8d30..9a975baa24 100644 --- a/src/libsystemd/src/sd-bus/bus-control.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-control.c @@ -24,7 +24,7 @@ #include <errno.h> #include <stddef.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-bloom.h" diff --git a/src/libsystemd/src/sd-bus/bus-control.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-control.h index c181aa7959..229c95efb0 100644 --- a/src/libsystemd/src/sd-bus/bus-control.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-control.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-match.h" diff --git a/src/libsystemd/src/sd-bus/bus-convenience.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-convenience.c index 2d06bf541f..2d06bf541f 100644 --- a/src/libsystemd/src/sd-bus/bus-convenience.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-convenience.c diff --git a/src/libsystemd/src/sd-bus/bus-creds.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.c index c4f693dee9..c4f693dee9 100644 --- a/src/libsystemd/src/sd-bus/bus-creds.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.c diff --git a/src/libsystemd/src/sd-bus/bus-creds.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.h index df8a1f1005..3e2311f91d 100644 --- a/src/libsystemd/src/sd-bus/bus-creds.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> struct sd_bus_creds { bool allocated; diff --git a/src/libsystemd/src/sd-bus/bus-dump.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.c index 7c81e7a25d..7c81e7a25d 100644 --- a/src/libsystemd/src/sd-bus/bus-dump.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.c diff --git a/src/libsystemd/src/sd-bus/bus-dump.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.h index 874e86d09c..68fa043786 100644 --- a/src/libsystemd/src/sd-bus/bus-dump.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.h @@ -22,7 +22,7 @@ #include <stdbool.h> #include <stdio.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> enum { BUS_MESSAGE_DUMP_WITH_HEADER = 1, diff --git a/src/libsystemd/src/sd-bus/bus-error.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-error.c index 26219bdeed..b6bb0c4a83 100644 --- a/src/libsystemd/src/sd-bus/bus-error.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-error.c @@ -24,7 +24,7 @@ #include <stdlib.h> #include <string.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/libsystemd/src/sd-bus/bus-error.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-error.h index e2c4cf4b3f..b7aedf406d 100644 --- a/src/libsystemd/src/sd-bus/bus-error.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-error.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "macro.h" diff --git a/src/libsystemd/src/sd-bus/bus-gvariant.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.c index 58782767fa..58782767fa 100644 --- a/src/libsystemd/src/sd-bus/bus-gvariant.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.c diff --git a/src/libsystemd/src/sd-bus/bus-gvariant.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.h index 6da637fb05..6da637fb05 100644 --- a/src/libsystemd/src/sd-bus/bus-gvariant.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.h diff --git a/src/libsystemd/src/sd-bus/bus-internal.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.c index caca679086..caca679086 100644 --- a/src/libsystemd/src/sd-bus/bus-internal.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.c diff --git a/src/libsystemd/src/sd-bus/bus-internal.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.h index 216d9f62bc..8c4c6fa772 100644 --- a/src/libsystemd/src/sd-bus/bus-internal.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.h @@ -22,7 +22,7 @@ #include <pthread.h> #include <sys/socket.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-error.h" #include "bus-kernel.h" diff --git a/src/libsystemd/src/sd-bus/bus-introspect.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.c index 8f93edb8da..8f93edb8da 100644 --- a/src/libsystemd/src/sd-bus/bus-introspect.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.c diff --git a/src/libsystemd/src/sd-bus/bus-introspect.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.h index 8e2f3800ca..87ac03b26a 100644 --- a/src/libsystemd/src/sd-bus/bus-introspect.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.h @@ -21,7 +21,7 @@ #include <stdio.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "set.h" diff --git a/src/libsystemd/src/sd-bus/bus-kernel.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.c index 0896eeb177..0896eeb177 100644 --- a/src/libsystemd/src/sd-bus/bus-kernel.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.c diff --git a/src/libsystemd/src/sd-bus/bus-kernel.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.h index 53ba3bdcf3..2927ba26a5 100644 --- a/src/libsystemd/src/sd-bus/bus-kernel.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #define KDBUS_ITEM_NEXT(item) \ (typeof(item))(((uint8_t *)item) + ALIGN8((item)->size)) diff --git a/src/libsystemd/src/sd-bus/bus-match.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-match.c index 397baf6f33..397baf6f33 100644 --- a/src/libsystemd/src/sd-bus/bus-match.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-match.c diff --git a/src/libsystemd/src/sd-bus/bus-match.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-match.h index 8cbbb63b11..3f71720185 100644 --- a/src/libsystemd/src/sd-bus/bus-match.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-match.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "hashmap.h" diff --git a/src/libsystemd/src/sd-bus/bus-message.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-message.c index 7be28c509b..6a9e87c2d8 100644 --- a/src/libsystemd/src/sd-bus/bus-message.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-message.c @@ -21,7 +21,7 @@ #include <fcntl.h> #include <sys/mman.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-gvariant.h" diff --git a/src/libsystemd/src/sd-bus/bus-message.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-message.h index 4710c106b9..6a2c2d533c 100644 --- a/src/libsystemd/src/sd-bus/bus-message.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-message.h @@ -23,7 +23,7 @@ #include <stdbool.h> #include <sys/socket.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-creds.h" #include "bus-protocol.h" diff --git a/src/libsystemd/src/sd-bus/bus-objects.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.c index 1f285ae8a6..1f285ae8a6 100644 --- a/src/libsystemd/src/sd-bus/bus-objects.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.c diff --git a/src/libsystemd/src/sd-bus/bus-objects.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.h index e0b8c534ed..e0b8c534ed 100644 --- a/src/libsystemd/src/sd-bus/bus-objects.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.h diff --git a/src/libsystemd/src/sd-bus/bus-protocol.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-protocol.h index 9d180cb284..9d180cb284 100644 --- a/src/libsystemd/src/sd-bus/bus-protocol.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-protocol.h diff --git a/src/libsystemd/src/sd-bus/bus-signature.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.c index 7bc243494a..7bc243494a 100644 --- a/src/libsystemd/src/sd-bus/bus-signature.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.c diff --git a/src/libsystemd/src/sd-bus/bus-signature.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.h index 1e0cd7f587..1e0cd7f587 100644 --- a/src/libsystemd/src/sd-bus/bus-signature.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.h diff --git a/src/libsystemd/src/sd-bus/bus-slot.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.c index a8c74011bf..b1783cd4a9 100644 --- a/src/libsystemd/src/sd-bus/bus-slot.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-control.h" diff --git a/src/libsystemd/src/sd-bus/bus-slot.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.h index 3b8b94dc6b..b862799d1c 100644 --- a/src/libsystemd/src/sd-bus/bus-slot.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-internal.h" diff --git a/src/libsystemd/src/sd-bus/bus-socket.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-socket.c index a2fb391239..a0008190c5 100644 --- a/src/libsystemd/src/sd-bus/bus-socket.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-socket.c @@ -22,8 +22,8 @@ #include <stdlib.h> #include <unistd.h> -#include "sd-bus.h" -#include "sd-daemon.h" +#include <systemd/sd-bus.h> +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/libsystemd/src/sd-bus/bus-socket.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-socket.h index 684feead74..6e1d32e6a7 100644 --- a/src/libsystemd/src/sd-bus/bus-socket.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-socket.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> void bus_socket_setup(sd_bus *b); diff --git a/src/libsystemd/src/sd-bus/bus-track.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-track.c index bdbf7d4a85..5d08b0a37b 100644 --- a/src/libsystemd/src/sd-bus/bus-track.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-track.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/libsystemd/src/sd-bus/bus-track.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-track.h index 7d93a727d6..7d93a727d6 100644 --- a/src/libsystemd/src/sd-bus/bus-track.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-track.h diff --git a/src/libsystemd/src/sd-bus/bus-type.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-type.c index c692afc580..c692afc580 100644 --- a/src/libsystemd/src/sd-bus/bus-type.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-type.c diff --git a/src/libsystemd/src/sd-bus/bus-type.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-type.h index 5c87eb5f08..7169b0f765 100644 --- a/src/libsystemd/src/sd-bus/bus-type.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-type.h @@ -21,7 +21,7 @@ #include <stdbool.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "macro.h" diff --git a/src/libsystemd/src/sd-bus/busctl-introspect.c b/src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.c index b09509f8e1..3c49ad5c57 100644 --- a/src/libsystemd/src/sd-bus/busctl-introspect.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "busctl-introspect.h" diff --git a/src/libsystemd/src/sd-bus/busctl-introspect.h b/src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.h index d922e352db..d922e352db 100644 --- a/src/libsystemd/src/sd-bus/busctl-introspect.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.h diff --git a/src/libsystemd/src/sd-bus/busctl.c b/src/libsystemd/libsystemd-internal/sd-bus/busctl.c index 35fabf038c..fd3b241aad 100644 --- a/src/libsystemd/src/sd-bus/busctl.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/busctl.c @@ -19,7 +19,7 @@ #include <getopt.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-dump.h" diff --git a/src/libsystemd/src/sd-bus/kdbus.h b/src/libsystemd/libsystemd-internal/sd-bus/kdbus.h index ecffc6b13c..ecffc6b13c 100644 --- a/src/libsystemd/src/sd-bus/kdbus.h +++ b/src/libsystemd/libsystemd-internal/sd-bus/kdbus.h diff --git a/src/libsystemd/src/sd-bus/sd-bus.c b/src/libsystemd/libsystemd-internal/sd-bus/sd-bus.c index c6f626d8aa..850949fa25 100644 --- a/src/libsystemd/src/sd-bus/sd-bus.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/sd-bus.c @@ -25,7 +25,7 @@ #include <sys/mman.h> #include <unistd.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-container.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-benchmark.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-benchmark.c index 56ac2ab3dd..a222d36bb4 100644 --- a/src/libsystemd/src/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-benchmark.c @@ -19,7 +19,7 @@ #include <sys/wait.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-internal.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-chat.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-chat.c index 048c0d19e2..1f028d2b23 100644 --- a/src/libsystemd/src/sd-bus/test-bus-chat.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-chat.c @@ -22,7 +22,7 @@ #include <stdlib.h> #include <unistd.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-error.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-cleanup.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-cleanup.c index 250a5b2908..bd4a3fbf34 100644 --- a/src/libsystemd/src/sd-bus/test-bus-cleanup.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-cleanup.c @@ -19,7 +19,7 @@ #include <stdio.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-internal.h" #include "bus-message.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-creds.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-creds.c index e9ef483bdd..c58b76c258 100644 --- a/src/libsystemd/src/sd-bus/test-bus-creds.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-creds.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-dump.h" #include "bus-util.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-error.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-error.c index 46d18abd29..b9ceda7a8b 100644 --- a/src/libsystemd/src/sd-bus/test-bus-error.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-error.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-common-errors.h" #include "bus-error.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-gvariant.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-gvariant.c index 83f114a0fe..3c9ec9fef0 100644 --- a/src/libsystemd/src/sd-bus/test-bus-gvariant.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-gvariant.c @@ -21,7 +21,7 @@ #include <glib.h> #endif -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-dump.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-introspect.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-introspect.c index 4425cfae26..4425cfae26 100644 --- a/src/libsystemd/src/sd-bus/test-bus-introspect.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-introspect.c diff --git a/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel-bloom.c index eb6179d7d2..f16e14a310 100644 --- a/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel-bloom.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-kernel.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-kernel.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel.c index 2214817312..2a5ba60cc9 100644 --- a/src/libsystemd/src/sd-bus/test-bus-kernel.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel.c @@ -19,7 +19,7 @@ #include <fcntl.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-dump.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-marshal.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-marshal.c index a28cc5b79e..45db4764a0 100644 --- a/src/libsystemd/src/sd-bus/test-bus-marshal.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-marshal.c @@ -28,7 +28,7 @@ #include <dbus/dbus.h> #endif -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-dump.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-match.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-match.c index 29c4529f95..29c4529f95 100644 --- a/src/libsystemd/src/sd-bus/test-bus-match.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-match.c diff --git a/src/libsystemd/src/sd-bus/test-bus-objects.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-objects.c index f11cafd888..e9bb655665 100644 --- a/src/libsystemd/src/sd-bus/test-bus-objects.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-objects.c @@ -20,7 +20,7 @@ #include <pthread.h> #include <stdlib.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-dump.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-proxy.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-proxy.c index 45d0a5ffce..a9fe44e66c 100644 --- a/src/libsystemd/src/sd-bus/test-bus-proxy.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-proxy.c @@ -21,7 +21,7 @@ #include <fcntl.h> #include <stdlib.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-dump.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-server.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-server.c index b6272efc30..190410674b 100644 --- a/src/libsystemd/src/sd-bus/test-bus-server.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-server.c @@ -20,7 +20,7 @@ #include <pthread.h> #include <stdlib.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "bus-internal.h" #include "bus-util.h" diff --git a/src/libsystemd/src/sd-bus/test-bus-signature.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-signature.c index 4f4fd093bf..4f4fd093bf 100644 --- a/src/libsystemd/src/sd-bus/test-bus-signature.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-signature.c diff --git a/src/libsystemd/src/sd-bus/test-bus-zero-copy.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-zero-copy.c index 3380e8500a..9e20d67670 100644 --- a/src/libsystemd/src/sd-bus/test-bus-zero-copy.c +++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-zero-copy.c @@ -19,7 +19,7 @@ #include <sys/mman.h> -#include "sd-bus.h" +#include <systemd/sd-bus.h> #include "alloc-util.h" #include "bus-dump.h" diff --git a/src/libsystemd/libsystemd-internal/sd-daemon/Makefile b/src/libsystemd/libsystemd-internal/sd-daemon/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-daemon/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/src/sd-daemon/sd-daemon.c b/src/libsystemd/libsystemd-internal/sd-daemon/sd-daemon.c index 4e50b61979..7c79a938b9 100644 --- a/src/libsystemd/src/sd-daemon/sd-daemon.c +++ b/src/libsystemd/libsystemd-internal/sd-daemon/sd-daemon.c @@ -31,7 +31,7 @@ #include <sys/un.h> #include <unistd.h> -#include "sd-daemon.h" +#include <systemd/sd-daemon.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd/libsystemd-internal/sd-device/Makefile b/src/libsystemd/libsystemd-internal/sd-device/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-device/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/src/sd-device/device-enumerator-private.h b/src/libsystemd/libsystemd-internal/sd-device/device-enumerator-private.h index eb06f9542d..d46e26b56e 100644 --- a/src/libsystemd/src/sd-device/device-enumerator-private.h +++ b/src/libsystemd/libsystemd-internal/sd-device/device-enumerator-private.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-device.h" +#include <systemd/sd-device.h> int device_enumerator_scan_devices(sd_device_enumerator *enumeartor); int device_enumerator_scan_subsystems(sd_device_enumerator *enumeartor); diff --git a/src/libsystemd/src/sd-device/device-enumerator.c b/src/libsystemd/libsystemd-internal/sd-device/device-enumerator.c index 4a7a8b1f9e..796728ee0e 100644 --- a/src/libsystemd/src/sd-device/device-enumerator.c +++ b/src/libsystemd/libsystemd-internal/sd-device/device-enumerator.c @@ -18,7 +18,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-device.h" +#include <systemd/sd-device.h> #include "alloc-util.h" #include "device-enumerator-private.h" diff --git a/src/libsystemd/src/sd-device/device-internal.h b/src/libsystemd/libsystemd-internal/sd-device/device-internal.h index b96441de56..b96441de56 100644 --- a/src/libsystemd/src/sd-device/device-internal.h +++ b/src/libsystemd/libsystemd-internal/sd-device/device-internal.h diff --git a/src/libsystemd/src/sd-device/device-private.c b/src/libsystemd/libsystemd-internal/sd-device/device-private.c index f2af3ab3ae..bf7d3c6f9f 100644 --- a/src/libsystemd/src/sd-device/device-private.c +++ b/src/libsystemd/libsystemd-internal/sd-device/device-private.c @@ -22,7 +22,7 @@ #include <net/if.h> #include <sys/types.h> -#include "sd-device.h" +#include <systemd/sd-device.h> #include "alloc-util.h" #include "device-internal.h" diff --git a/src/libsystemd/src/sd-device/device-private.h b/src/libsystemd/libsystemd-internal/sd-device/device-private.h index 29b3e155fb..d6add2f7b2 100644 --- a/src/libsystemd/src/sd-device/device-private.h +++ b/src/libsystemd/libsystemd-internal/sd-device/device-private.h @@ -23,7 +23,7 @@ #include <stdbool.h> #include <sys/types.h> -#include "sd-device.h" +#include <systemd/sd-device.h> int device_new_from_nulstr(sd_device **ret, uint8_t *nulstr, size_t len); int device_new_from_strv(sd_device **ret, char **strv); diff --git a/src/libsystemd/src/sd-device/device-util.h b/src/libsystemd/libsystemd-internal/sd-device/device-util.h index 5b42e11de6..5b42e11de6 100644 --- a/src/libsystemd/src/sd-device/device-util.h +++ b/src/libsystemd/libsystemd-internal/sd-device/device-util.h diff --git a/src/libsystemd/src/sd-device/sd-device.c b/src/libsystemd/libsystemd-internal/sd-device/sd-device.c index 9633e46ce0..895002499c 100644 --- a/src/libsystemd/src/sd-device/sd-device.c +++ b/src/libsystemd/libsystemd-internal/sd-device/sd-device.c @@ -22,7 +22,7 @@ #include <net/if.h> #include <sys/types.h> -#include "sd-device.h" +#include <systemd/sd-device.h> #include "alloc-util.h" #include "device-internal.h" diff --git a/src/libsystemd/libsystemd-internal/sd-event/Makefile b/src/libsystemd/libsystemd-internal/sd-event/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-event/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/src/sd-event/sd-event.c b/src/libsystemd/libsystemd-internal/sd-event/sd-event.c index deef6ba9d3..0fec8d71b2 100644 --- a/src/libsystemd/src/sd-event/sd-event.c +++ b/src/libsystemd/libsystemd-internal/sd-event/sd-event.c @@ -21,9 +21,9 @@ #include <sys/timerfd.h> #include <sys/wait.h> -#include "sd-daemon.h" -#include "sd-event.h" -#include "sd-id128.h" +#include <systemd/sd-daemon.h> +#include <systemd/sd-event.h> +#include <systemd/sd-id128.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd/src/sd-event/test-event.c b/src/libsystemd/libsystemd-internal/sd-event/test-event.c index daea4126f8..6beb1b08cd 100644 --- a/src/libsystemd/src/sd-event/test-event.c +++ b/src/libsystemd/libsystemd-internal/sd-event/test-event.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-event.h" +#include <systemd/sd-event.h> #include "fd-util.h" #include "log.h" diff --git a/src/libsystemd/libsystemd-internal/sd-hwdb/Makefile b/src/libsystemd/libsystemd-internal/sd-hwdb/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-hwdb/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/src/sd-hwdb/hwdb-internal.h b/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-internal.h index 13fddfc8ad..13fddfc8ad 100644 --- a/src/libsystemd/src/sd-hwdb/hwdb-internal.h +++ b/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-internal.h diff --git a/src/libsystemd/src/sd-hwdb/hwdb-util.h b/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-util.h index 5e21e5008b..05dc47962b 100644 --- a/src/libsystemd/src/sd-hwdb/hwdb-util.h +++ b/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-util.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-hwdb.h" +#include <systemd/sd-hwdb.h> #include "util.h" diff --git a/src/libsystemd/src/sd-hwdb/sd-hwdb.c b/src/libsystemd/libsystemd-internal/sd-hwdb/sd-hwdb.c index 062fa97b17..7dcfe95b87 100644 --- a/src/libsystemd/src/sd-hwdb/sd-hwdb.c +++ b/src/libsystemd/libsystemd-internal/sd-hwdb/sd-hwdb.c @@ -27,7 +27,7 @@ #include <string.h> #include <sys/mman.h> -#include "sd-hwdb.h" +#include <systemd/sd-hwdb.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd/libsystemd-internal/sd-id128/Makefile b/src/libsystemd/libsystemd-internal/sd-id128/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-id128/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/src/sd-id128/sd-id128.c b/src/libsystemd/libsystemd-internal/sd-id128/sd-id128.c index d9c0116f60..cda3e9f0df 100644 --- a/src/libsystemd/src/sd-id128/sd-id128.c +++ b/src/libsystemd/libsystemd-internal/sd-id128/sd-id128.c @@ -21,7 +21,7 @@ #include <fcntl.h> #include <unistd.h> -#include "sd-id128.h" +#include <systemd/sd-id128.h> #include "fd-util.h" #include "hexdecoct.h" diff --git a/src/libsystemd/libsystemd-internal/sd-login/Makefile b/src/libsystemd/libsystemd-internal/sd-login/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-login/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/src/sd-login/sd-login.c b/src/libsystemd/libsystemd-internal/sd-login/sd-login.c index 9d4f187502..84831d5e95 100644 --- a/src/libsystemd/src/sd-login/sd-login.c +++ b/src/libsystemd/libsystemd-internal/sd-login/sd-login.c @@ -23,7 +23,7 @@ #include <sys/inotify.h> #include <unistd.h> -#include "sd-login.h" +#include <systemd/sd-login.h> #include "alloc-util.h" #include "cgroup-util.h" diff --git a/src/libsystemd/src/sd-login/test-login.c b/src/libsystemd/libsystemd-internal/sd-login/test-login.c index c1fd7dd33e..994c76df4a 100644 --- a/src/libsystemd/src/sd-login/test-login.c +++ b/src/libsystemd/libsystemd-internal/sd-login/test-login.c @@ -20,7 +20,7 @@ #include <poll.h> #include <string.h> -#include "sd-login.h" +#include <systemd/sd-login.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/Makefile b/src/libsystemd/libsystemd-internal/sd-netlink/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-netlink/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/src/sd-netlink/local-addresses.c b/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c index 6abd8fd0cc..e6feb859cd 100644 --- a/src/libsystemd/src/sd-netlink/local-addresses.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c @@ -18,7 +18,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "alloc-util.h" #include "local-addresses.h" diff --git a/src/libsystemd/src/sd-netlink/local-addresses.h b/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.h index 18d71e797e..1ddc50ace5 100644 --- a/src/libsystemd/src/sd-netlink/local-addresses.h +++ b/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.h @@ -20,7 +20,7 @@ ***/ -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "in-addr-util.h" diff --git a/src/libsystemd/src/sd-netlink/netlink-internal.h b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-internal.h index dcfb080ad3..1d29c3a369 100644 --- a/src/libsystemd/src/sd-netlink/netlink-internal.h +++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-internal.h @@ -21,7 +21,7 @@ #include <linux/netlink.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "list.h" #include "netlink-types.h" diff --git a/src/libsystemd/src/sd-netlink/netlink-message.c b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-message.c index 3a866fdafe..0c307661f1 100644 --- a/src/libsystemd/src/sd-netlink/netlink-message.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-message.c @@ -21,7 +21,7 @@ #include <stdbool.h> #include <unistd.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "alloc-util.h" #include "formats-util.h" diff --git a/src/libsystemd/src/sd-netlink/netlink-socket.c b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-socket.c index 590fc53fc7..25b7509217 100644 --- a/src/libsystemd/src/sd-netlink/netlink-socket.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-socket.c @@ -21,7 +21,7 @@ #include <stdbool.h> #include <unistd.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "alloc-util.h" #include "formats-util.h" diff --git a/src/libsystemd/src/sd-netlink/netlink-types.c b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.c index a5758bb516..a5758bb516 100644 --- a/src/libsystemd/src/sd-netlink/netlink-types.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.c diff --git a/src/libsystemd/src/sd-netlink/netlink-types.h b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.h index ecb20bfcdc..ecb20bfcdc 100644 --- a/src/libsystemd/src/sd-netlink/netlink-types.h +++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.h diff --git a/src/libsystemd/src/sd-netlink/netlink-util.c b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.c index 73b9ac0258..828ae7db7f 100644 --- a/src/libsystemd/src/sd-netlink/netlink-util.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "netlink-internal.h" #include "netlink-util.h" diff --git a/src/libsystemd/src/sd-netlink/netlink-util.h b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.h index f49bf4eaa6..e8f932549f 100644 --- a/src/libsystemd/src/sd-netlink/netlink-util.h +++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.h @@ -19,7 +19,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "util.h" diff --git a/src/libsystemd/src/sd-netlink/rtnl-message.c b/src/libsystemd/libsystemd-internal/sd-netlink/rtnl-message.c index 090552f576..2f1254295a 100644 --- a/src/libsystemd/src/sd-netlink/rtnl-message.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/rtnl-message.c @@ -21,7 +21,7 @@ #include <stdbool.h> #include <unistd.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "formats-util.h" #include "missing.h" diff --git a/src/libsystemd/src/sd-netlink/sd-netlink.c b/src/libsystemd/libsystemd-internal/sd-netlink/sd-netlink.c index 4833815b43..c536364a24 100644 --- a/src/libsystemd/src/sd-netlink/sd-netlink.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/sd-netlink.c @@ -20,7 +20,7 @@ #include <poll.h> #include <sys/socket.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd/src/sd-netlink/test-local-addresses.c b/src/libsystemd/libsystemd-internal/sd-netlink/test-local-addresses.c index e0e28cc0cc..e0e28cc0cc 100644 --- a/src/libsystemd/src/sd-netlink/test-local-addresses.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/test-local-addresses.c diff --git a/src/libsystemd/src/sd-netlink/test-netlink.c b/src/libsystemd/libsystemd-internal/sd-netlink/test-netlink.c index de5e0ffc8f..e16c35144d 100644 --- a/src/libsystemd/src/sd-netlink/test-netlink.c +++ b/src/libsystemd/libsystemd-internal/sd-netlink/test-netlink.c @@ -20,7 +20,7 @@ #include <net/if.h> #include <netinet/ether.h> -#include "sd-netlink.h" +#include <systemd/sd-netlink.h> #include "ether-addr-util.h" #include "macro.h" diff --git a/src/libsystemd/libsystemd-internal/sd-network/Makefile b/src/libsystemd/libsystemd-internal/sd-network/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-network/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/src/sd-network/network-util.c b/src/libsystemd/libsystemd-internal/sd-network/network-util.c index a0d9b5f1a4..a0d9b5f1a4 100644 --- a/src/libsystemd/src/sd-network/network-util.c +++ b/src/libsystemd/libsystemd-internal/sd-network/network-util.c diff --git a/src/libsystemd/src/sd-network/network-util.h b/src/libsystemd/libsystemd-internal/sd-network/network-util.h index 26780dce28..8c4dbc68b1 100644 --- a/src/libsystemd/src/sd-network/network-util.h +++ b/src/libsystemd/libsystemd-internal/sd-network/network-util.h @@ -19,6 +19,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-network.h" +#include <systemd/sd-network.h> bool network_is_online(void); diff --git a/src/libsystemd/src/sd-network/sd-network.c b/src/libsystemd/libsystemd-internal/sd-network/sd-network.c index 62051992ef..5ebe7de7af 100644 --- a/src/libsystemd/src/sd-network/sd-network.c +++ b/src/libsystemd/libsystemd-internal/sd-network/sd-network.c @@ -23,7 +23,7 @@ #include <string.h> #include <sys/inotify.h> -#include "sd-network.h" +#include <systemd/sd-network.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd/libsystemd-internal/sd-path/Makefile b/src/libsystemd/libsystemd-internal/sd-path/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-path/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/src/sd-path/sd-path.c b/src/libsystemd/libsystemd-internal/sd-path/sd-path.c index 480f1ad065..61a8b092da 100644 --- a/src/libsystemd/src/sd-path/sd-path.c +++ b/src/libsystemd/libsystemd-internal/sd-path/sd-path.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-path.h" +#include <systemd/sd-path.h> #include "alloc-util.h" #include "architecture.h" diff --git a/src/libsystemd/libsystemd-internal/sd-resolve/Makefile b/src/libsystemd/libsystemd-internal/sd-resolve/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-resolve/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/src/sd-resolve/sd-resolve.c b/src/libsystemd/libsystemd-internal/sd-resolve/sd-resolve.c index 653dbfbe57..30176d7283 100644 --- a/src/libsystemd/src/sd-resolve/sd-resolve.c +++ b/src/libsystemd/libsystemd-internal/sd-resolve/sd-resolve.c @@ -29,7 +29,7 @@ #include <sys/prctl.h> #include <unistd.h> -#include "sd-resolve.h" +#include <systemd/sd-resolve.h> #include "alloc-util.h" #include "fd-util.h" diff --git a/src/libsystemd/src/sd-resolve/test-resolve.c b/src/libsystemd/libsystemd-internal/sd-resolve/test-resolve.c index 33ef6fc0f7..9e3ac16597 100644 --- a/src/libsystemd/src/sd-resolve/test-resolve.c +++ b/src/libsystemd/libsystemd-internal/sd-resolve/test-resolve.c @@ -26,7 +26,7 @@ #include <string.h> #include <sys/socket.h> -#include "sd-resolve.h" +#include <systemd/sd-resolve.h> #include "alloc-util.h" #include "macro.h" diff --git a/src/libsystemd/libsystemd-internal/sd-utf8/Makefile b/src/libsystemd/libsystemd-internal/sd-utf8/Makefile new file mode 120000 index 0000000000..71a1159ce0 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/sd-utf8/Makefile @@ -0,0 +1 @@ +../subdir.mk
\ No newline at end of file diff --git a/src/libsystemd/src/sd-utf8/sd-utf8.c b/src/libsystemd/libsystemd-internal/sd-utf8/sd-utf8.c index 33a5a04ea1..77be8e1996 100644 --- a/src/libsystemd/src/sd-utf8/sd-utf8.c +++ b/src/libsystemd/libsystemd-internal/sd-utf8/sd-utf8.c @@ -17,7 +17,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ -#include "sd-utf8.h" +#include <systemd/sd-utf8.h> #include "utf8.h" #include "util.h" diff --git a/src/libsystemd/libsystemd-internal/subdir.mk b/src/libsystemd/libsystemd-internal/subdir.mk new file mode 100644 index 0000000000..69eb85a4d7 --- /dev/null +++ b/src/libsystemd/libsystemd-internal/subdir.mk @@ -0,0 +1,7 @@ +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk +include $(topsrcdir)/automake.head.mk + +#CPPFLAGS += $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS) +#CPPFLAGS += -DLIBDIR=\"$(libdir)\" -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" + +include $(topsrcdir)/automake.tail.mk diff --git a/src/libsystemd/libsystemd-journal-internal/Makefile b/src/libsystemd/libsystemd-journal-internal/Makefile new file mode 100644 index 0000000000..210ca07d5d --- /dev/null +++ b/src/libsystemd/libsystemd-journal-internal/Makefile @@ -0,0 +1,71 @@ +pkginclude_HEADERS += \ + src/systemd/sd-journal.h \ + src/systemd/sd-messages.h \ + src/systemd/_sd-common.h + +libsystemd_journal_internal_la_SOURCES = \ + src/journal/sd-journal.c \ + src/systemd/sd-journal.h \ + src/systemd/_sd-common.h \ + src/journal/journal-file.c \ + src/journal/journal-file.h \ + src/journal/journal-vacuum.c \ + src/journal/journal-vacuum.h \ + src/journal/journal-verify.c \ + src/journal/journal-verify.h \ + src/journal/lookup3.c \ + src/journal/lookup3.h \ + src/journal/journal-send.c \ + src/journal/journal-def.h \ + src/journal/compress.h \ + src/journal/catalog.c \ + src/journal/catalog.h \ + src/journal/mmap-cache.c \ + src/journal/mmap-cache.h \ + src/journal/compress.c \ + src/journal/audit-type.h \ + src/journal/audit-type.c + +nodist_libsystemd_journal_internal_la_SOURCES = \ + src/journal/audit_type-to-name.h + +gperf_txt_sources += \ + src/journal/audit_type-list.txt + +# using _CFLAGS = in the conditional below would suppress AM_CFLAGS +libsystemd_journal_internal_la_CFLAGS = \ + $(AM_CFLAGS) + +libsystemd_journal_internal_la_LIBADD = + +ifneq ($(HAVE_XZ),) +libsystemd_journal_internal_la_CFLAGS += \ + $(XZ_CFLAGS) + +libsystemd_journal_internal_la_LIBADD += \ + $(XZ_LIBS) +endif + +ifneq ($(HAVE_LZ4),) +libsystemd_journal_internal_la_LIBADD += \ + -llz4 +endif + +ifneq ($(HAVE_GCRYPT),) +libsystemd_journal_internal_la_SOURCES += \ + src/journal/journal-authenticate.c \ + src/journal/journal-authenticate.h \ + src/journal/fsprg.c \ + src/journal/fsprg.h + +libsystemd_journal_internal_la_LIBADD += \ + $(GCRYPT_LIBS) + +# fsprg.c is a drop-in file using void pointer arithmetic +libsystemd_journal_internal_la_CFLAGS += \ + $(GCRYPT_CFLAGS) \ + -Wno-pointer-arith +endif + +noinst_LTLIBRARIES += \ + libsystemd-journal-internal.la diff --git a/src/libsystemd/src/libsystemd.pc.in b/src/libsystemd/libsystemd.pc.in index e8f79507ea..e8f79507ea 100644 --- a/src/libsystemd/src/libsystemd.pc.in +++ b/src/libsystemd/libsystemd.pc.in diff --git a/src/libsystemd/src/libsystemd.sym b/src/libsystemd/libsystemd.sym index 4ab637b686..4ab637b686 100644 --- a/src/libsystemd/src/libsystemd.sym +++ b/src/libsystemd/libsystemd.sym diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile index e485cac514..9adc4a0dea 100644 --- a/src/systemd-nspawn/Makefile +++ b/src/systemd-nspawn/Makefile @@ -46,15 +46,19 @@ systemd_nspawn_SOURCES = \ src/core/loopback-setup.c \ src/core/loopback-setup.h +nodist_systemd_nspawn_SOURCES = \ + src/nspawn/nspawn-gperf.c + +gperf_gperf_sources += \ + src/nspawn/nspawn-gperf.gperf + am_out_files = systemd-nspawn -CPPFLAGS += -I$(topsrcdir)/src/libbasic -CPPFLAGS += -I$(topoutdir)/src/libbasic -CPPFLAGS += -I$(topsrcdir)/src/libshared -CPPFLAGS += -I$(topoutdir)/src/libshared -CPPFLAGS += -I$(topsrcdir)/src/libsystemd/include -CPPFLAGS += -I$(topoutdir)/src/libsystemd/include -CPPFLAGS += -I$(topsrcdir)/src/libudev/include -CPPFLAGS += -I$(topoutdir)/src/libudev/include +CPPFLAGS += $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS) $(libsystemd.CPPFLAGS) $(libudev.CPPFLAGS) $(libblkid.CPPFLAGS) +CPPFLAGS += -I$(topsrcdir)/src/libsystemd/src/sd-netlink -I$(topsrcdir)/src/libsystemd/src/sd-bus -I$(topsrcdir)/src/udev -I$(topsrcdir)/src/libudev/src +CPPFLAGS += $(libblkid.CPPFLAGS) $(libseccomp.CPPFLAGS) +ifneq ($(HAVE_LIBIPTC),) +CPPFLAGS += $(libfirewall.CPPFLAGS) +endif $(outdir)/systemd-nspawn: \ $(outdir)/nspawn.o \ $(outdir)/nspawn-settings.o \ @@ -67,7 +71,10 @@ $(outdir)/systemd-nspawn: \ $(outdir)/nspawn-stub-pid1.o \ $(outdir)/mount-setup.o \ $(outdir)/loopback-setup.o \ - $(topsrcdir)/libshared/libshared.la $(BLKID_LIBS) + $(libshared.DEPENDS) $(libblkid.DEPENDS) +ifneq ($(HAVE_LIBIPTC),) +$(outdir)/systemd-nspawn: $(libfirewall.DEPENDS) +endif $(outdir)/mount-setup.c: $(topsrcdir)/src/libcore/mount-setup.c; $(CP) $< $@ $(outdir)/mount-setup.h: $(topsrcdir)/src/libcore/mount-setup.h; $(CP) $< $@ @@ -76,24 +83,4 @@ $(outdir)/loopback-setup.h: $(topsrcdir)/src/libcore/loopback-setup.h; $(CP) $< $(outdir)/nspawn.o: $(outdir)/loopback-setup.h -nodist_systemd_nspawn_SOURCES = \ - src/nspawn/nspawn-gperf.c - -gperf_gperf_sources += \ - src/nspawn/nspawn-gperf.gperf - -systemd_nspawn_CFLAGS = \ - $(AM_CFLAGS) \ - $(BLKID_CFLAGS) \ - $(SECCOMP_CFLAGS) - -systemd_nspawn_LDADD = \ - libshared.la \ - $(BLKID_LIBS) - -ifneq ($(HAVE_LIBIPTC),) -systemd_nspawn_LDADD += \ - libfirewall.la -endif - include $(topsrcdir)/automake.tail.mk diff --git a/src/systemd-nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c index 8122a14f7b..d82e495fa8 100644 --- a/src/systemd-nspawn/nspawn-expose-ports.c +++ b/src/systemd-nspawn/nspawn-expose-ports.c @@ -21,7 +21,7 @@ #include "alloc-util.h" #include "fd-util.h" -#include "firewall-util.h" +#include <firewall-util.h> #include "in-addr-util.h" #include "local-addresses.h" #include "netlink-util.h" diff --git a/src/udev/udev.h b/src/udev/udev.h index 1f9c8120c0..3aace1532f 100644 --- a/src/udev/udev.h +++ b/src/udev/udev.h @@ -21,8 +21,8 @@ #include <sys/param.h> #include <sys/types.h> -#include "libudev.h" -#include "sd-netlink.h" +#include <libudev.h> +#include <systemd/sd-netlink.h> #include "label.h" #include "libudev-private.h" |