chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "journalctl: remove unexpected behavior of journalctl -b"
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index dcf0bb3bb3fa120799d20b65c740b512e7340502..162a7be45e351cd54d593e91a4fbf70e148ce555 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-694,6
+694,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/time-util.h \
src/shared/hashmap.c \
src/shared/hashmap.h \
src/shared/time-util.h \
src/shared/hashmap.c \
src/shared/hashmap.h \
+ src/shared/siphash24.c \
+ src/shared/siphash24.h \
src/shared/set.c \
src/shared/set.h \
src/shared/fdset.c \
src/shared/set.c \
src/shared/set.h \
src/shared/fdset.c \
@@
-753,8
+755,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/fileio.c \
src/shared/fileio.h \
src/shared/output-mode.h \
src/shared/fileio.c \
src/shared/fileio.h \
src/shared/output-mode.h \
- src/shared/MurmurHash
3
.c \
- src/shared/MurmurHash
3
.h \
+ src/shared/MurmurHash
2
.c \
+ src/shared/MurmurHash
2
.h \
src/shared/acpi-fpdt.h \
src/shared/acpi-fpdt.c \
src/shared/boot-timestamps.h \
src/shared/acpi-fpdt.h \
src/shared/acpi-fpdt.c \
src/shared/boot-timestamps.h \
@@
-1582,6
+1584,7
@@
nodist_systemunit_DATA += \
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
+ tmpfiles.d/systemd-nologin.conf \
tmpfiles.d/tmp.conf \
tmpfiles.d/x11.conf
tmpfiles.d/tmp.conf \
tmpfiles.d/x11.conf
@@
-1899,6
+1902,7
@@
bus-proxyd-uninstall-hook:
INSTALL_EXEC_HOOKS += bus-proxyd-install-hook
UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook
INSTALL_EXEC_HOOKS += bus-proxyd-install-hook
UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook
+if ENABLE_KDBUS
nodist_systemunit_DATA += \
units/systemd-bus-proxyd@.service
nodist_systemunit_DATA += \
units/systemd-bus-proxyd@.service
@@
-1910,6
+1914,7
@@
dist_userunit_DATA += \
USER_UNIT_ALIASES += \
$(systemunitdir)/systemd-bus-proxyd@.service systemd-bus-proxyd@.service
USER_UNIT_ALIASES += \
$(systemunitdir)/systemd-bus-proxyd@.service systemd-bus-proxyd@.service
+endif
EXTRA_DIST += \
units/systemd-bus-proxyd@.service.in
EXTRA_DIST += \
units/systemd-bus-proxyd@.service.in
@@
-2022,6
+2027,9
@@
libsystemd_bus_la_SOURCES = \
src/libsystemd-bus/event-util.h \
src/libsystemd-bus/bus-protocol.h
src/libsystemd-bus/event-util.h \
src/libsystemd-bus/bus-protocol.h
+nodist_libsystemd_bus_la_SOURCES = \
+ src/libsystemd-bus/bus-error-mapping.c
+
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
@@
-2040,16
+2048,23
@@
pkgconfiglib_DATA += \
src/libsystemd-bus/libsystemd-bus.pc
EXTRA_DIST += \
src/libsystemd-bus/libsystemd-bus.pc
EXTRA_DIST += \
+ src/libsystemd-bus/bus-error-mapping.gperf \
src/libsystemd-bus/libsystemd-bus.pc.in \
src/libsystemd-bus/DIFFERENCES \
src/libsystemd-bus/GVARIANT-SERIALIZATION
src/libsystemd-bus/libsystemd-bus.pc.in \
src/libsystemd-bus/DIFFERENCES \
src/libsystemd-bus/GVARIANT-SERIALIZATION
+CLEANFILES += \
+ src/libsystemd-bus/bus-error-mapping.c
+
lib_LTLIBRARIES += \
libsystemd-bus.la
libsystemd_bus_internal_la_SOURCES = \
$(libsystemd_bus_la_SOURCES)
lib_LTLIBRARIES += \
libsystemd-bus.la
libsystemd_bus_internal_la_SOURCES = \
$(libsystemd_bus_la_SOURCES)
+nodist_libsystemd_bus_internal_la_SOURCES = \
+ $(nodist_libsystemd_bus_la_SOURCES)
+
libsystemd_bus_internal_la_CFLAGS = \
$(libsystemd_bus_la_CFLAGS)
libsystemd_bus_internal_la_CFLAGS = \
$(libsystemd_bus_la_CFLAGS)
@@
-2410,6
+2425,8
@@
dist_udevhwdb_DATA = \
hwdb/20-pci-classes.hwdb \
hwdb/20-usb-vendor-model.hwdb \
hwdb/20-usb-classes.hwdb \
hwdb/20-pci-classes.hwdb \
hwdb/20-usb-vendor-model.hwdb \
hwdb/20-usb-classes.hwdb \
+ hwdb/20-sdio-vendor-model.hwdb \
+ hwdb/20-sdio-classes.hwdb \
hwdb/20-bluetooth-vendor-product.hwdb \
hwdb/20-acpi-vendor.hwdb \
hwdb/20-OUI.hwdb \
hwdb/20-bluetooth-vendor-product.hwdb \
hwdb/20-acpi-vendor.hwdb \
hwdb/20-OUI.hwdb \
@@
-3697,7
+3714,14
@@
dist_zshcompletion_DATA += \
endif
endif
-if ENABLE_BUS_DRIVERD
+polkitpolicy_in_files += \
+ src/hostname/org.freedesktop.hostname1.policy.in
+
+EXTRA_DIST += \
+ units/systemd-hostnamed.service.in
+
+# ------------------------------------------------------------------------------
+if ENABLE_KDBUS
systemd_bus_driverd_SOURCES = \
src/bus-driverd/bus-driverd.c
systemd_bus_driverd_SOURCES = \
src/bus-driverd/bus-driverd.c
@@
-3709,13
+3733,20
@@
systemd_bus_driverd_LDADD = \
rootlibexec_PROGRAMS += \
systemd-bus-driverd
rootlibexec_PROGRAMS += \
systemd-bus-driverd
-endif
-polkitpolicy_in_files += \
- src/hostname/org.freedesktop.hostname1.policy.in
+nodist_systemunit_DATA += \
+ units/systemd-bus-driverd.service
+
+dist_systemunit_DATA += \
+ units/org.freedesktop.DBus.busname
+
+BUSNAMES_TARGET_WANTS += \
+ org.freedesktop.DBus.busname
+
+endif
EXTRA_DIST += \
EXTRA_DIST += \
- units/systemd-
hostname
d.service.in
+ units/systemd-
bus-driver
d.service.in
# ------------------------------------------------------------------------------
if ENABLE_LOCALED
# ------------------------------------------------------------------------------
if ENABLE_LOCALED
@@
-4982,4
+5013,4
@@
tests += \
test-libudev-sym
cppcheck:
test-libudev-sym
cppcheck:
- cppcheck --enable=all $(top_srcdir)
+ cppcheck --enable=all
-q
$(top_srcdir)