X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=321379ca5fa7994d510968c0a0b1d052b3b5488e;hb=ed3e4a3fd96891b5e7015723978e78cd21efd4fe;hp=60f69fe32fc90b16054850c3e68b1450f3a5e366;hpb=d4e85aac0bed39c8341da2614609c3d62825f1bf;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 60f69fe32..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, @@ -187,6 +187,8 @@ AM_CPPFLAGS = \ -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \ -DQUOTACHECK=\"$(QUOTACHECK)\" \ -DKEXEC=\"$(KEXEC)\" \ + -DLIBDIR=\"$(libdir)\" \ + -DROOTLIBDIR=\"$(rootlibdir)\" \ -I $(top_srcdir)/src \ -I $(top_builddir)/src/shared \ -I $(top_srcdir)/src/shared \ @@ -344,7 +346,8 @@ bin_PROGRAMS = \ systemd-detect-virt \ systemd-delta \ systemd-analyze \ - systemd-run + systemd-run \ + systemd-path dist_bin_SCRIPTS = \ src/kernel-install/kernel-install @@ -724,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 \ @@ -816,8 +821,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/bus-label.c \ src/shared/bus-label.h \ src/shared/gpt.h \ - src/shared/generator.h \ - src/shared/generator.c \ src/shared/clean-ipc.h \ src/shared/clean-ipc.c \ src/shared/login-shared.c \ @@ -874,7 +877,11 @@ libsystemd_label_la_SOURCES = \ src/shared/fileio-label.c \ src/shared/fileio-label.h \ src/shared/dev-setup.c \ - src/shared/dev-setup.h + src/shared/dev-setup.h \ + src/shared/dropin.c \ + src/shared/dropin.h \ + src/shared/generator.h \ + src/shared/generator.c libsystemd_label_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1865,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 \ @@ -2094,6 +2135,14 @@ systemd_notify_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +# ------------------------------------------------------------------------------ +systemd_path_SOURCES = \ + src/path/path.c + +systemd_path_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_ask_password_SOURCES = \ src/ask-password/ask-password.c @@ -2219,6 +2268,7 @@ libsystemd_internal_la_SOURCES = \ src/systemd/sd-login.h \ src/systemd/sd-id128.h \ src/systemd/sd-daemon.h \ + src/systemd/sd-path.h \ src/libsystemd/sd-bus/sd-bus.c \ src/libsystemd/sd-bus/bus-control.c \ src/libsystemd/sd-bus/bus-control.h \ @@ -2272,7 +2322,8 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-rtnl/rtnl-util.c \ src/libsystemd/sd-id128/sd-id128.c \ src/libsystemd/sd-daemon/sd-daemon.c \ - src/libsystemd/sd-login/sd-login.c + src/libsystemd/sd-login/sd-login.c \ + src/libsystemd/sd-path/sd-path.c nodist_libsystemd_internal_la_SOURCES = \ src/libsystemd/libsystemd.sym \ @@ -2375,7 +2426,8 @@ pkginclude_HEADERS += \ src/systemd/sd-utf8.h \ src/systemd/sd-event.h \ src/systemd/sd-rtnl.h \ - src/systemd/sd-resolve.h + src/systemd/sd-resolve.h \ + src/systemd/sd-path.h endif lib_LTLIBRARIES += \ @@ -3514,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 \ @@ -3605,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 \ @@ -3640,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) @@ -3651,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 \ @@ -4516,6 +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 \