X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=f4b19589a1b1c6f7d5938bdb6ef5d629a9fc90a6;hp=dcf0bb3bb3fa120799d20b65c740b512e7340502;hb=56e61788c5270af99646bde353abc8b1d54ad71f;hpb=294c866023d05162880b056fea5242d25cd9e865

diff --git a/Makefile.am b/Makefile.am
index dcf0bb3bb..f4b19589a 100644
--- 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/siphash24.c \
+	src/shared/siphash24.h \
 	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/MurmurHash3.c \
-	src/shared/MurmurHash3.h \
+	src/shared/MurmurHash2.c \
+	src/shared/MurmurHash2.h \
 	src/shared/acpi-fpdt.h \
 	src/shared/acpi-fpdt.c \
 	src/shared/boot-timestamps.h \
@@ -1899,6 +1901,7 @@ 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
 
@@ -1910,6 +1913,7 @@ dist_userunit_DATA += \
 
 USER_UNIT_ALIASES += \
 	$(systemunitdir)/systemd-bus-proxyd@.service systemd-bus-proxyd@.service
+endif
 
 EXTRA_DIST += \
 	units/systemd-bus-proxyd@.service.in
@@ -2022,6 +2026,9 @@ libsystemd_bus_la_SOURCES = \
 	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 \
@@ -2040,16 +2047,23 @@ pkgconfiglib_DATA += \
 	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
 
+CLEANFILES += \
+	src/libsystemd-bus/bus-error-mapping.c
+
 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)
 
@@ -2410,6 +2424,8 @@ dist_udevhwdb_DATA = \
 	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 \
@@ -3697,7 +3713,14 @@ dist_zshcompletion_DATA += \
 
 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
 
@@ -3709,13 +3732,20 @@ systemd_bus_driverd_LDADD = \
 
 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 += \
-	units/systemd-hostnamed.service.in
+	units/systemd-bus-driverd.service.in
 
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED