X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=843a7df9e003abfba1b47a3863433d8836f3d65e;hb=1c724e9e0ec5bc4bf791a3d7b1cf5b955cdb98b2;hp=5847bb4ae4f9a79e223f65cda58881c2a679af81;hpb=ea24d8d1383e038d6b6e599d42c0114b3dbd8acb;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 5847bb4ae..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= @@ -393,8 +394,7 @@ rootlibexec_PROGRAMS = \ systemd-sleep \ systemd-bus-proxyd \ systemd-socket-proxyd \ - systemd-update-done \ - systemd-user-sessions + systemd-update-done if HAVE_UTMP rootlibexec_PROGRAMS += \ @@ -555,8 +555,7 @@ nodist_systemunit_DATA = \ units/initrd-udevadm-cleanup-db.service \ units/initrd-switch-root.service \ units/systemd-nspawn@.service \ - units/systemd-update-done.service \ - units/systemd-user-sessions.service + units/systemd-update-done.service if HAVE_UTMP nodist_systemunit_DATA += \ @@ -609,8 +608,7 @@ EXTRA_DIST += \ units/initrd-udevadm-cleanup-db.service.in \ units/initrd-switch-root.service.in \ units/systemd-nspawn@.service.in \ - units/systemd-update-done.service.in \ - units/systemd-user-sessions.service.in + units/systemd-update-done.service.in CLEANFILES += \ units/console-shell.service.m4 \ @@ -980,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 @@ -2125,13 +2125,6 @@ systemd_update_done_LDADD = \ libsystemd-label.la \ libsystemd-shared.la -# ------------------------------------------------------------------------------ -systemd_user_sessions_SOURCES = \ - src/user-sessions/user-sessions.c - -systemd_user_sessions_LDADD = \ - libsystemd-shared.la - # ------------------------------------------------------------------------------ systemd_shutdownd_SOURCES = \ src/shutdownd/shutdownd.c @@ -2222,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 \ @@ -2252,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 # ------------------------------------------------------------------------------ @@ -2280,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 += \ @@ -2369,6 +2364,7 @@ systemd_fsck_LDADD = \ # ------------------------------------------------------------------------------ systemd_fsckd_SOURCES = \ src/fsckd/fsckd.c \ + src/fsckd/fsckd.h \ $(NULL) systemd_fsckd_LDADD = \ @@ -2551,6 +2547,7 @@ efi_cflags = \ -fno-strict-aliasing \ -fno-stack-protector \ -Wsign-compare \ + -Wno-missing-field-initializers \ -mno-sse \ -mno-mmx @@ -3943,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 \ @@ -4824,7 +4826,7 @@ dist_bashcompletion_DATA += \ dist_zshcompletion_DATA += \ shell-completion/zsh/_coredumpctl -sysctl_DATA = \ +nodist_sysctl_DATA = \ sysctl.d/50-coredump.conf CLEANFILES += \ @@ -5428,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 \ @@ -5444,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 \ @@ -5480,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 @@ -6015,6 +6049,7 @@ pamlib_LTLIBRARIES = \ dist_pamconf_DATA = \ src/login/systemd-user + endif nodist_systemunit_DATA += \ @@ -6074,6 +6109,30 @@ EXTRA_DIST += \ 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 \ @@ -6596,8 +6655,7 @@ LOCAL_FS_TARGET_WANTS += \ MULTI_USER_TARGET_WANTS += \ getty.target \ - systemd-ask-password-wall.path \ - systemd-user-sessions.service + systemd-ask-password-wall.path SYSINIT_TARGET_WANTS += \ dev-hugepages.mount \