X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=7bb7f75915a5d54a37099ec442cd083043c0e464;hb=fdb14b7ef40d1f19f3bd7c8fa2a3821c2be87a5e;hp=be25023c75522fe35b8f9364447020e8f3f0b2e3;hpb=f22e0bce3732c1fd005b7a886042394e036bc1b3;p=elogind.git diff --git a/Makefile.am b/Makefile.am index be25023c7..7bb7f7591 100644 --- a/Makefile.am +++ b/Makefile.am @@ -378,7 +378,6 @@ rootlibexec_PROGRAMS = \ systemd \ systemd-cgroups-agent \ systemd-initctl \ - systemd-update-utmp \ systemd-shutdownd \ systemd-shutdown \ systemd-remount-fs \ @@ -391,6 +390,11 @@ rootlibexec_PROGRAMS = \ systemd-socket-proxyd \ systemd-update-done +if HAVE_UTMP +rootlibexec_PROGRAMS += \ + systemd-update-utmp +endif + systemgenerator_PROGRAMS = \ systemd-getty-generator \ systemd-fstab-generator \ @@ -517,8 +521,6 @@ nodist_systemunit_DATA = \ units/systemd-initctl.service \ units/systemd-shutdownd.service \ units/systemd-remount-fs.service \ - units/systemd-update-utmp.service \ - units/systemd-update-utmp-runlevel.service \ units/systemd-ask-password-wall.service \ units/systemd-ask-password-console.service \ units/systemd-sysctl.service \ @@ -544,6 +546,12 @@ nodist_systemunit_DATA = \ units/systemd-nspawn@.service \ units/systemd-update-done.service +if HAVE_UTMP +nodist_systemunit_DATA += \ + units/systemd-update-utmp.service \ + units/systemd-update-utmp-runlevel.service +endif + dist_userunit_DATA = \ units/user/basic.target \ units/user/default.target \ @@ -721,7 +729,6 @@ EXTRA_DIST += \ $(man_MANS) \ tools/make-man-index.py \ tools/make-directive-index.py \ - tools/make-man-rules.py \ tools/xml_helper.py # ------------------------------------------------------------------------------ @@ -805,7 +812,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/cgroup-show.h \ src/shared/unit-name.c \ src/shared/unit-name.h \ - src/shared/utmp-wtmp.c \ src/shared/utmp-wtmp.h \ src/shared/watchdog.c \ src/shared/watchdog.h \ @@ -879,6 +885,11 @@ libsystemd_shared_la_SOURCES = \ src/shared/switch-root.c \ src/shared/nss-util.h +if HAVE_UTMP +libsystemd_shared_la_SOURCES += \ + src/shared/utmp-wtmp.c +endif + nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ src/shared/errno-to-name.h \ @@ -1342,7 +1353,8 @@ tests += \ test-async \ test-ratelimit \ test-condition-util \ - test-uid-range + test-uid-range \ + test-bus-policy EXTRA_DIST += \ test/a.service \ @@ -1374,7 +1386,12 @@ EXTRA_DIST += \ test/sysinit.target \ test/testsuite.target \ test/timers.target \ - test/unstoppable.service + test/unstoppable.service \ + test/bus-policy/hello.conf \ + test/bus-policy/methods.conf \ + test/bus-policy/ownerships.conf \ + test/bus-policy/signals.conf + EXTRA_DIST += \ src/test/test-helper.h @@ -1782,6 +1799,16 @@ test_conf_files_SOURCES = \ test_conf_files_LDADD = \ libsystemd-shared.la +test_bus_policy_SOURCES = \ + src/bus-proxyd/test-bus-policy.c \ + src/bus-proxyd/bus-policy.c \ + src/bus-proxyd/bus-policy.h + +test_bus_policy_LDADD = \ + libsystemd-capability.la \ + libsystemd-internal.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ ## .PHONY so it always rebuilds it .PHONY: coverage lcov-run lcov-report coverage-sync @@ -2034,9 +2061,11 @@ endif dist_factory_etc_DATA = \ factory/etc/nsswitch.conf +if HAVE_PAM dist_factory_pam_DATA = \ factory/etc/pam.d/system-auth \ factory/etc/pam.d/other +endif # ------------------------------------------------------------------------------ if ENABLE_FIRSTBOOT @@ -2330,8 +2359,7 @@ systemctl_LDADD = \ # ------------------------------------------------------------------------------ systemd_notify_SOURCES = \ - src/notify/notify.c \ - src/readahead/sd-readahead.c + src/notify/notify.c systemd_notify_LDADD = \ libsystemd-internal.la \ @@ -2987,6 +3015,7 @@ noinst_LTLIBRARIES += \ noinst_PROGRAMS += \ systemd-evcat \ + systemd-modeset \ systemd-subterm unifontdatadir=$(datadir)/unifont @@ -3045,6 +3074,19 @@ systemd_evcat_LDADD = \ libsystemd-shared.la \ $(TERMINAL_LIBS) +systemd_modeset_CFLAGS = \ + $(AM_CFLAGS) \ + $(TERMINAL_CFLAGS) + +systemd_modeset_SOURCES = \ + src/libsystemd-terminal/modeset.c + +systemd_modeset_LDADD = \ + libsystemd-terminal.la \ + libsystemd-internal.la \ + libsystemd-shared.la \ + $(TERMINAL_LIBS) + systemd_subterm_SOURCES = \ src/libsystemd-terminal/subterm.c @@ -4098,8 +4140,9 @@ dist_pkgsysconf_DATA += \ dist_catalog_DATA = \ catalog/systemd.fr.catalog \ - catalog/systemd.ru.catalog \ catalog/systemd.it.catalog \ + catalog/systemd.pl.catalog \ + catalog/systemd.ru.catalog \ catalog/systemd.catalog SOCKETS_TARGET_WANTS += \ @@ -4302,57 +4345,6 @@ endif EXTRA_DIST += \ units/systemd-vconsole-setup.service.in -# ------------------------------------------------------------------------------ -if ENABLE_READAHEAD -systemd_readahead_SOURCES = \ - src/readahead/readahead.c \ - src/readahead/readahead-collect.c \ - src/readahead/readahead-replay.c \ - src/readahead/readahead-analyze.c \ - src/readahead/readahead-common.c \ - src/readahead/readahead-common.h - -systemd_readahead_LDADD = \ - libsystemd-internal.la \ - libudev-internal.la \ - libsystemd-shared.la - -dist_doc_DATA += \ - src/readahead/sd-readahead.c \ - src/systemd/sd-readahead.h - -rootlibexec_PROGRAMS += \ - systemd-readahead - -dist_systemunit_DATA += \ - units/systemd-readahead-drop.service \ - units/systemd-readahead-done.timer - -nodist_systemunit_DATA += \ - units/systemd-readahead-collect.service \ - units/systemd-readahead-replay.service \ - units/systemd-readahead-done.service - -manual_tests += \ - test-ssd - -test_ssd_SOURCES = \ - src/readahead/test-ssd.c \ - src/readahead/readahead-common.c \ - src/readahead/readahead-common.h - -test_ssd_LDADD = \ - libsystemd-internal.la \ - libudev-internal.la \ - libsystemd-shared.la - -endif - -EXTRA_DIST += \ - units/systemd-readahead-collect.service.in \ - units/systemd-readahead-replay.service.in \ - units/systemd-readahead-done.service.in - # ------------------------------------------------------------------------------ if ENABLE_BOOTCHART systemd_bootchart_SOURCES = \ @@ -5877,6 +5869,7 @@ SOCKETS_TARGET_WANTS += \ systemd-initctl.socket \ systemd-shutdownd.socket +if HAVE_UTMP if HAVE_SYSV_COMPAT RUNLEVEL1_TARGET_WANTS += \ systemd-update-utmp-runlevel.service @@ -5891,7 +5884,10 @@ RUNLEVEL5_TARGET_WANTS += \ endif SYSINIT_TARGET_WANTS += \ - systemd-update-utmp.service \ + systemd-update-utmp.service +endif + +SYSINIT_TARGET_WANTS += \ systemd-update-done.service LOCAL_FS_TARGET_WANTS += \