X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=5f31daa07ab8972456d63640c8feb6960b0d2e03;hp=8bef21bda34d1aeaffa7f4bc4bc408522ab4a046;hb=9b55cd5665d94e2245a4ca90d2548bbcfe8c34fb;hpb=15e913230c652ace36abfbf2b6fed0c1f56b8711

diff --git a/Makefile.am b/Makefile.am
index 8bef21bda..5f31daa07 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -489,7 +489,7 @@ EXTRA_DIST += \
 	units/user/systemd-exit.service.in \
 	units/systemd-fsck@.service.in \
 	units/systemd-fsck-root.service.in \
-	units/user@.service.in \
+	units/user@.service.m4.in \
 	units/systemd-udevd.service \
 	units/systemd-udev-trigger.service \
 	units/systemd-udev-settle.service \
@@ -508,7 +508,8 @@ CLEANFILES += \
 	units/console-shell.service.m4 \
 	units/console-getty.service.m4 \
 	units/container-getty@.service.m4 \
-	units/rescue.service.m4
+	units/rescue.service.m4 \
+	units/user@.service.m4
 
 if HAVE_SYSV_COMPAT
 nodist_systemunit_DATA += \
@@ -694,6 +695,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 +756,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 \
@@ -776,7 +779,9 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/syscall-list.c \
 	src/shared/syscall-list.h \
 	src/shared/audit.c \
-	src/shared/audit.h
+	src/shared/audit.h \
+	src/shared/xml.c \
+	src/shared/xml.h
 
 nodist_libsystemd_shared_la_SOURCES = \
 	src/shared/errno-from-name.h \
@@ -1153,7 +1158,8 @@ tests += \
 	test-hashmap \
 	test-list \
 	test-tables \
-	test-device-nodes
+	test-device-nodes \
+	test-xml
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1255,6 +1261,12 @@ test_hashmap_SOURCES = \
 test_hashmap_LDADD = \
 	libsystemd-core.la
 
+test_xml_SOURCES = \
+	src/test/test-xml.c
+
+test_xml_LDADD = \
+	libsystemd-shared.la
+
 test_list_SOURCES = \
 	src/test/test-list.c
 
@@ -1582,6 +1594,7 @@ nodist_systemunit_DATA += \
 
 dist_tmpfiles_DATA = \
 	tmpfiles.d/systemd.conf \
+	tmpfiles.d/systemd-nologin.conf \
 	tmpfiles.d/tmp.conf \
 	tmpfiles.d/x11.conf
 
@@ -1891,7 +1904,7 @@ systemd_bus_proxyd_LDADD = \
 	libsystemd-shared.la
 
 bus-proxyd-install-hook:
-	$(AM_V_LN)$(LN_S) -f ../../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
+	$(AM_V_LN)$(LN_S) -f ../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
 
 bus-proxyd-uninstall-hook:
 	rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
@@ -2422,6 +2435,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 \
@@ -3911,8 +3926,8 @@ noinst_LTLIBRARIES += \
 	libsystemd-dhcp.la
 
 libsystemd_dhcp_la_LIBADD = \
-	libsystemd-shared.la \
-	libsystemd-bus.la
+	libsystemd-bus-internal.la \
+	libsystemd-shared.la
 
 test_dhcp_option_SOURCES = \
 	src/libsystemd-dhcp/dhcp-protocol.h \
@@ -3930,9 +3945,11 @@ test_dhcp_client_SOURCES = \
 	src/libsystemd-dhcp/test-dhcp-client.c
 
 test_dhcp_client_LDADD = \
+	libsystemd-bus-internal.la \
+	libsystemd-daemon-internal.la \
+	libsystemd-id128-internal.la \
 	libsystemd-dhcp.la \
-	libsystemd-shared.la \
-	libsystemd-bus.la
+	libsystemd-shared.la
 
 tests += \
 	test-dhcp-option \
@@ -4607,11 +4624,11 @@ src/%: src/%.m4
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
 units/%: units/%.m4
-	$(AM_V_M4)$(MKDIR_P) $(dir $@)
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
 
 units/user/%: units/%.m4
-	$(AM_V_M4)$(MKDIR_P) $(dir $@)
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 if ENABLE_POLKIT
@@ -4883,8 +4900,9 @@ install-tree: all
 # exclude the one perl script we have in there
 valgrind-tests: $(TESTS)
 	$(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
-		echo "Running $$f"; \
+		echo -e "$${x}Running $$f"; \
 	        libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; \
+		x="\n\n"; \
 	done
 
 exported-%: %
@@ -5008,4 +5026,4 @@ tests += \
 	test-libudev-sym
 
 cppcheck:
-	cppcheck --enable=all $(top_srcdir)
+	cppcheck --enable=all -q $(top_srcdir)