X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=843a7df9e003abfba1b47a3863433d8836f3d65e;hb=1c724e9e0ec5bc4bf791a3d7b1cf5b955cdb98b2;hp=7f01668c3fedc751516c524a553dddb59894a038;hpb=a804d849b3c2199bc25d1d4e65fc119fa4d7d0e2;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 7f01668c3..843a7df9e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -145,6 +145,7 @@ dist_pkgdata_DATA = dist_dbuspolicy_DATA = dist_dbussystemservice_DATA = dist_systemunit_DATA_busnames = +dist_sysusers_DATA = check_PROGRAMS = check_DATA = tests= @@ -499,6 +500,7 @@ dist_systemunit_DATA = \ units/sys-kernel-debug.mount \ units/sys-fs-fuse-connections.mount \ units/tmp.mount \ + units/var-lib-machines.mount \ units/printer.target \ units/sound.target \ units/bluetooth.target \ @@ -976,6 +978,8 @@ libsystemd_label_la_SOURCES = \ src/shared/btrfs-ctree.h \ src/shared/machine-image.c \ src/shared/machine-image.h \ + src/shared/machine-pool.c \ + src/shared/machine-pool.h \ src/shared/copy.c \ src/shared/copy.h @@ -2211,10 +2215,10 @@ nodist_systemunit_DATA += \ units/systemd-tmpfiles-clean.service nodist_tmpfiles_DATA = \ + tmpfiles.d/systemd.conf \ tmpfiles.d/etc.conf dist_tmpfiles_DATA = \ - tmpfiles.d/systemd.conf \ tmpfiles.d/systemd-nologin.conf \ tmpfiles.d/tmp.conf \ tmpfiles.d/x11.conf \ @@ -2241,12 +2245,14 @@ INSTALL_DIRS += \ endif EXTRA_DIST += \ + tmpfiles.d/systemd.conf.m4 \ tmpfiles.d/etc.conf.m4 \ units/systemd-tmpfiles-setup-dev.service.in \ units/systemd-tmpfiles-setup.service.in \ units/systemd-tmpfiles-clean.service.in CLEANFILES += \ + tmpfiles.d/systemd.conf \ tmpfiles.d/etc.conf # ------------------------------------------------------------------------------ @@ -2269,17 +2275,17 @@ nodist_systemunit_DATA += \ SYSINIT_TARGET_WANTS += \ systemd-sysusers.service -dist_sysusers_DATA = \ - sysusers.d/systemd.conf - nodist_sysusers_DATA = \ + sysusers.d/systemd.conf \ sysusers.d/basic.conf EXTRA_DIST += \ units/systemd-sysusers.service.in \ + sysusers.d/systemd.conf.m4 \ sysusers.d/basic.conf.in CLEANFILES += \ + sysusers.d/systemd.conf \ sysusers.d/basic.conf INSTALL_DIRS += \ @@ -2358,6 +2364,7 @@ systemd_fsck_LDADD = \ # ------------------------------------------------------------------------------ systemd_fsckd_SOURCES = \ src/fsckd/fsckd.c \ + src/fsckd/fsckd.h \ $(NULL) systemd_fsckd_LDADD = \ @@ -2530,6 +2537,7 @@ efi_cflags = \ $(EFI_CFLAGS) \ -Wall \ -Wextra \ + -std=gnu90 \ -nostdinc \ -ggdb -O0 \ -fpic \ @@ -2539,6 +2547,7 @@ efi_cflags = \ -fno-strict-aliasing \ -fno-stack-protector \ -Wsign-compare \ + -Wno-missing-field-initializers \ -mno-sse \ -mno-mmx @@ -2546,8 +2555,7 @@ if ARCH_X86_64 efi_cflags += \ -mno-red-zone \ -DEFI_FUNCTION_WRAPPER \ - -DGNU_EFI_USE_MS_ABI \ - -std=gnu90 + -DGNU_EFI_USE_MS_ABI endif efi_ldflags = \ @@ -2600,11 +2608,15 @@ $(systemd_boot): $(systemd_boot_solib) stub_headers = \ src/boot/efi/util.h \ src/boot/efi/pefile.h \ + src/boot/efi/graphics.h \ + src/boot/efi/splash.h \ src/boot/efi/linux.h stub_sources = \ src/boot/efi/util.c \ src/boot/efi/pefile.c \ + src/boot/efi/graphics.c \ + src/boot/efi/splash.c \ src/boot/efi/linux.c \ src/boot/efi/stub.c @@ -3928,9 +3940,14 @@ TESTS += \ if HAVE_PYTHON TESTS += \ test/rule-syntax-check.py \ + $(NULL) + +if HAVE_SYSV_COMPAT +TESTS += \ test/sysv-generator-test.py \ $(NULL) endif +endif manual_tests += \ test-libudev \ @@ -4809,7 +4826,7 @@ dist_bashcompletion_DATA += \ dist_zshcompletion_DATA += \ shell-completion/zsh/_coredumpctl -sysctl_DATA = \ +nodist_sysctl_DATA = \ sysctl.d/50-coredump.conf CLEANFILES += \ @@ -5413,14 +5430,16 @@ if HAVE_GCRYPT rootlibexec_PROGRAMS += \ systemd-importd \ - systemd-pull + systemd-pull \ + systemd-import systemd_importd_SOURCES = \ src/import/importd.c systemd_importd_CFLAGS = \ $(AM_CFLAGS) \ - -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" + -D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" \ + -D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" systemd_importd_LDADD = \ libsystemd-internal.la \ @@ -5429,16 +5448,20 @@ systemd_importd_LDADD = \ systemd_pull_SOURCES = \ src/import/pull.c \ - src/import/import-raw.c \ - src/import/import-raw.h \ - src/import/import-tar.c \ - src/import/import-tar.h \ - src/import/import-dkr.c \ - src/import/import-dkr.h \ - src/import/import-job.c \ - src/import/import-job.h \ + src/import/pull-raw.c \ + src/import/pull-raw.h \ + src/import/pull-tar.c \ + src/import/pull-tar.h \ + src/import/pull-dkr.c \ + src/import/pull-dkr.h \ + src/import/pull-job.c \ + src/import/pull-job.h \ + src/import/pull-common.c \ + src/import/pull-common.h \ src/import/import-common.c \ src/import/import-common.h \ + src/import/import-compress.c \ + src/import/import-compress.h \ src/import/curl-util.c \ src/import/curl-util.h \ src/import/aufs-util.c \ @@ -5465,6 +5488,32 @@ systemd_pull_LDADD = \ -lbz2 \ $(GCRYPT_LIBS) +systemd_import_SOURCES = \ + src/import/import.c \ + src/import/import-raw.c \ + src/import/import-raw.h \ + src/import/import-tar.c \ + src/import/import-tar.h \ + src/import/import-common.c \ + src/import/import-common.h \ + src/import/import-compress.c \ + src/import/import-compress.h \ + src/import/qcow2-util.c \ + src/import/qcow2-util.h + +systemd_import_CFLAGS = \ + $(AM_CFLAGS) \ + $(XZ_CFLAGS) \ + $(ZLIB_CFLAGS) + +systemd_import_LDADD = \ + libsystemd-internal.la \ + libsystemd-label.la \ + libsystemd-shared.la \ + $(XZ_LIBS) \ + $(ZLIB_LIBS) \ + -lbz2 + dist_rootlibexec_DATA = \ src/import/import-pubring.gpg @@ -5902,15 +5951,8 @@ endif noinst_LTLIBRARIES += \ libsystemd-logind-core.la -systemd_user_sessions_SOURCES = \ - src/login/user-sessions.c - -systemd_user_sessions_LDADD = \ - libsystemd-shared.la - rootlibexec_PROGRAMS += \ - systemd-logind \ - systemd-user-sessions + systemd-logind loginctl_SOURCES = \ src/login/loginctl.c \ @@ -6007,11 +6049,11 @@ pamlib_LTLIBRARIES = \ dist_pamconf_DATA = \ src/login/systemd-user + endif nodist_systemunit_DATA += \ - units/systemd-logind.service \ - units/systemd-user-sessions.service + units/systemd-logind.service dist_systemunit_DATA += \ units/user.slice @@ -6035,8 +6077,7 @@ INSTALL_DIRS += \ $(systemdstatedir) MULTI_USER_TARGET_WANTS += \ - systemd-logind.service \ - systemd-user-sessions.service + systemd-logind.service SYSTEM_UNIT_ALIASES += \ systemd-logind.service dbus-org.freedesktop.login1.service @@ -6065,10 +6106,33 @@ EXTRA_DIST += \ src/login/logind-gperf.gperf \ src/login/71-seat.rules.in \ src/login/73-seat-late.rules.in \ - units/systemd-logind.service.in \ + units/systemd-logind.service.in + +# ------------------------------------------------------------------------------ +if HAVE_PAM + +systemd_user_sessions_SOURCES = \ + src/user-sessions/user-sessions.c + +systemd_user_sessions_LDADD = \ + libsystemd-shared.la + +rootlibexec_PROGRAMS += \ + systemd-user-sessions + +nodist_systemunit_DATA += \ + units/systemd-user-sessions.service + +EXTRA_DIST += \ units/systemd-user-sessions.service.in +MULTI_USER_TARGET_WANTS += \ + systemd-user-sessions.service + +endif + # ------------------------------------------------------------------------------ + if HAVE_PYTHON_DEVEL pkgpyexec_LTLIBRARIES = \ _journal.la \ @@ -6586,7 +6650,8 @@ SYSINIT_TARGET_WANTS += \ LOCAL_FS_TARGET_WANTS += \ systemd-remount-fs.service \ - tmp.mount + tmp.mount \ + var-lib-machines.mount MULTI_USER_TARGET_WANTS += \ getty.target \