chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: fix hello ioctl buffer size calculation
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 3f47bc8e5d094ddffb655ebaf6eb0c7c34e018ef..f4b19589a1b1c6f7d5938bdb6ef5d629a9fc90a6 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 \
@@
-2024,6
+2026,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 \
@@
-2042,16
+2047,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)
@@
-2412,6
+2424,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 \
@@
-3718,8
+3732,21
@@
systemd_bus_driverd_LDADD = \
rootlibexec_PROGRAMS += \
systemd-bus-driverd
rootlibexec_PROGRAMS += \
systemd-bus-driverd
+
+nodist_systemunit_DATA += \
+ units/systemd-bus-driverd.service
+
+dist_systemunit_DATA += \
+ units/org.freedesktop.DBus.busname
+
+BUSNAMES_TARGET_WANTS += \
+ org.freedesktop.DBus.busname
+
endif
endif
+EXTRA_DIST += \
+ units/systemd-bus-driverd.service.in
+
# ------------------------------------------------------------------------------
if ENABLE_LOCALED
systemd_localed_SOURCES = \
# ------------------------------------------------------------------------------
if ENABLE_LOCALED
systemd_localed_SOURCES = \