X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=77a976af2afeb79a1b8e0e21e0415279c16c4f9f;hp=01afbe3a228bfdd54378b9983987e4bcee5f0e29;hb=b1a5a9989ada9b3738d71605f051ff393d41f2ff;hpb=d89c8fdf48c7bad5816b9f2e77e8361721f22517

diff --git a/Makefile.am b/Makefile.am
index 01afbe3a2..77a976af2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -347,7 +347,8 @@ bin_PROGRAMS = \
 	systemd-delta \
 	systemd-analyze \
 	systemd-run \
-	systemd-path
+	systemd-path \
+	systemd-escape
 
 dist_bin_SCRIPTS = \
 	src/kernel-install/kernel-install
@@ -727,6 +728,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/path-util.h \
 	src/shared/time-util.c \
 	src/shared/time-util.h \
+	src/shared/locale-util.c \
+	src/shared/locale-util.h \
 	src/shared/hashmap.c \
 	src/shared/hashmap.h \
 	src/shared/siphash24.c \
@@ -1870,6 +1873,33 @@ INSTALL_DIRS += \
 	$(sysusersdir)
 endif
 
+# ------------------------------------------------------------------------------
+if ENABLE_FIRSTBOOT
+systemd_firstboot_SOURCES = \
+	src/firstboot/firstboot.c
+
+systemd_firstboot_LDADD = \
+	libsystemd-units.la \
+	libsystemd-label.la \
+	libsystemd-capability.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la \
+	-lcrypt
+
+rootbin_PROGRAMS += \
+	systemd-firstboot
+
+nodist_systemunit_DATA += \
+	units/systemd-firstboot.service
+
+EXTRA_DIST += \
+	units/systemd-firstboot.service.in
+
+SYSINIT_TARGET_WANTS += \
+	systemd-firstboot.service
+
+endif
+
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
 	src/machine-id-setup/machine-id-setup-main.c \
@@ -2079,6 +2109,13 @@ systemd_cgroups_agent_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
+systemd_escape_SOURCES = \
+	src/escape/escape.c
+
+systemd_escape_LDADD = \
+	libsystemd-shared.la
+
+# -----------------------------------------------------------------------------
 systemctl_SOURCES = \
 	src/systemctl/systemctl.c
 
@@ -3537,6 +3574,13 @@ test_compress_LDADD = \
 	libsystemd-journal-internal.la \
 	libsystemd-shared.la
 
+test_compress_benchmark_SOURCES = \
+	src/journal/test-compress-benchmark.c
+
+test_compress_benchmark_LDADD = \
+	libsystemd-journal-internal.la \
+	libsystemd-shared.la
+
 libsystemd_journal_core_la_SOURCES = \
 	src/journal/journald-kmsg.c \
 	src/journal/journald-kmsg.h \
@@ -3619,7 +3663,9 @@ tests += \
 	test-mmap-cache \
 	test-catalog
 
-tests += test-compress
+tests += \
+	test-compress \
+	test-compress-benchmark
 
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
@@ -4537,6 +4583,7 @@ libsystemd_networkd_core_la_SOURCES = \
 	src/network/networkd-macvlan.c \
 	src/network/networkd-dummy.c \
 	src/network/networkd-tuntap.c \
+	src/network/networkd-bond.c \
 	src/network/networkd-network.c \
 	src/network/networkd-address.c \
 	src/network/networkd-route.c \