X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=bd3313815a3fed15c124228bce60905c9b26cf9e;hb=0c51aada566403039544bc8ef094fadb4af29e23;hp=ec5f04d9e90d15448afd75da16224a20ad6d58d1;hpb=137243fd130149ce22071d22c7de95bf46c7079c;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index ec5f04d9e..bd3313815 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -297,10 +297,14 @@ define install-relative-aliases
 	done
 endef
 
+install-touch-usr-hook:
+	touch -c $(DESTDIR)/$(prefix)
+
 INSTALL_EXEC_HOOKS += \
 	install-target-wants-hook \
 	install-directories-hook \
-	install-aliases-hook
+	install-aliases-hook \
+	install-touch-usr-hook
 
 # ------------------------------------------------------------------------------
 AM_V_M4 = $(AM_V_M4_$(V))
@@ -509,6 +513,9 @@ dist_userunit_DATA = \
 nodist_userunit_DATA = \
 	units/user/systemd-exit.service
 
+dist_systempreset_DATA = \
+	system-preset/90-systemd.preset
+
 EXTRA_DIST += \
 	units/getty@.service.m4 \
 	units/serial-getty@.service.m4 \
@@ -1233,7 +1240,9 @@ tests += \
 	test-tables \
 	test-device-nodes \
 	test-xml \
-	test-architecture
+	test-architecture \
+	test-socket-util \
+	test-fdset
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1337,12 +1346,24 @@ test_utf8_SOURCES = \
 test_utf8_LDADD = \
 	libsystemd-shared.la
 
+test_fdset_SOURCES = \
+	src/test/test-fdset.c
+
+test_fdset_LDADD = \
+	libsystemd-core.la
+
 test_util_SOURCES = \
 	src/test/test-util.c
 
 test_util_LDADD = \
 	libsystemd-core.la
 
+test_socket_util_SOURCES = \
+	src/test/test-socket-util.c
+
+test_socket_util_LDADD = \
+	libsystemd-core.la
+
 test_ring_SOURCES = \
 	src/test/test-ring.c
 
@@ -3516,7 +3537,7 @@ libsystemd_journal_internal_la_SOURCES = \
 	src/journal/mmap-cache.h
 
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
-libsystemd_journal_internal_la_CFLAGS =
+libsystemd_journal_internal_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD =
@@ -3665,9 +3686,26 @@ systemd_coredump_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
+if HAVE_ELFUTILS
+systemd_coredump_SOURCES += \
+	src/journal/stacktrace.c \
+	src/journal/stacktrace.h
+
+systemd_coredump_LDADD += \
+	$(ELFUTILS_LIBS)
+endif
+
 rootlibexec_PROGRAMS += \
 	systemd-coredump
 
+dist_pkgsysconf_DATA += \
+	src/journal/coredump.conf
+
+if HAVE_ACL
+systemd_coredump_LDADD += \
+	libsystemd-acl.la
+endif
+
 systemd_coredumpctl_SOURCES = \
 	src/journal/coredumpctl.c
 
@@ -3912,7 +3950,8 @@ systemgenerator_PROGRAMS += \
 	systemd-cryptsetup-generator
 
 dist_systemunit_DATA += \
-	units/cryptsetup.target
+	units/cryptsetup.target \
+	units/cryptsetup-pre.target
 
 systemd_cryptsetup_SOURCES = \
 	src/cryptsetup/cryptsetup.c
@@ -4358,10 +4397,12 @@ libsystemd_networkd_core_la_SOURCES = \
 	src/network/networkd-netdev.c \
 	src/network/networkd-tunnel.c \
 	src/network/networkd-veth.c \
+	src/network/networkd-vxlan.c \
 	src/network/networkd-network.c \
 	src/network/networkd-address.c \
 	src/network/networkd-route.c \
-	src/network/networkd-manager.c
+	src/network/networkd-manager.c \
+	src/network/networkd-address-pool.c
 
 nodist_libsystemd_networkd_core_la_SOURCES = \
 	src/network/networkd-network-gperf.c \