X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=321379ca5fa7994d510968c0a0b1d052b3b5488e;hb=ed3e4a3fd96891b5e7015723978e78cd21efd4fe;hp=d2edf3daaf36b3f991034902ab95a872ab2b2c84;hpb=9a00f57a5ba7ed431e6bac8d8b36518708503b4e;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index d2edf3daa..321379ca5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,16 +35,16 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBUDEV_CURRENT=5
-LIBUDEV_REVISION=1
-LIBUDEV_AGE=4
+LIBUDEV_CURRENT=6
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=5
 
 LIBGUDEV_CURRENT=2
 LIBGUDEV_REVISION=0
 LIBGUDEV_AGE=2
 
 LIBSYSTEMD_CURRENT=3
-LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_REVISION=1
 LIBSYSTEMD_AGE=3
 
 # The following four libraries only exist for compatibility reasons,
@@ -727,6 +727,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 +1872,40 @@ 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
+
+systemgenerator_PROGRAMS += \
+	systemd-firstboot-generator
+
+systemd_firstboot_generator_SOURCES = \
+	src/firstboot/firstboot-generator.c
+
+systemd_firstboot_generator_LDADD = \
+	libsystemd-label.la \
+	libsystemd-shared.la
+
+endif
+
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
 	src/machine-id-setup/machine-id-setup-main.c \
@@ -3530,14 +3566,19 @@ test_catalog_CPPFLAGS = \
 test_catalog_LDADD = \
 	libsystemd-journal-core.la
 
-if HAVE_XZ
 test_compress_SOURCES = \
 	src/journal/test-compress.c
 
 test_compress_LDADD = \
 	libsystemd-journal-internal.la \
 	libsystemd-shared.la
-endif
+
+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 \
@@ -3621,9 +3662,9 @@ tests += \
 	test-mmap-cache \
 	test-catalog
 
-if HAVE_XZ
-tests += test-compress
-endif
+tests += \
+	test-compress \
+	test-compress-benchmark
 
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
@@ -3656,10 +3697,10 @@ libsystemd_journal_internal_la_CFLAGS = \
 
 libsystemd_journal_internal_la_LIBADD =
 
-if HAVE_XZ
 libsystemd_journal_internal_la_SOURCES += \
 	src/journal/compress.c
 
+if HAVE_XZ
 libsystemd_journal_internal_la_CFLAGS += \
 	$(XZ_CFLAGS)
 
@@ -3667,6 +3708,11 @@ libsystemd_journal_internal_la_LIBADD += \
 	$(XZ_LIBS)
 endif
 
+if HAVE_LZ4
+libsystemd_journal_internal_la_LIBADD += \
+	-llz4
+endif
+
 if HAVE_GCRYPT
 libsystemd_journal_internal_la_SOURCES += \
 	src/journal/journal-authenticate.c \
@@ -4532,7 +4578,10 @@ libsystemd_networkd_core_la_SOURCES = \
 	src/network/networkd-tunnel.c \
 	src/network/networkd-veth.c \
 	src/network/networkd-vxlan.c \
+	src/network/networkd-vlan.c \
+	src/network/networkd-macvlan.c \
 	src/network/networkd-dummy.c \
+	src/network/networkd-tuntap.c \
 	src/network/networkd-network.c \
 	src/network/networkd-address.c \
 	src/network/networkd-route.c \