X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=694335f582a076dadb265c633c0f1413c7fabde6;hp=005493053599ac3eb37d0d49a6bc6eb54069ebc7;hb=0237edf7d24a53792122ec1c8225babf2ad3e227;hpb=48d437bbf10aa80d37b280ed946a51dee5bc69b8 diff --git a/Makefile.am b/Makefile.am index 005493053..694335f58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,8 @@ INSTALL_EXEC_HOOKS = UNINSTALL_EXEC_HOOKS = INSTALL_DATA_HOOKS = pkginclude_HEADERS = +lib_LTLIBRARIES = +pkgconfiglib_DATA = polkitpolicy_in_files = AM_CPPFLAGS = \ @@ -186,8 +188,6 @@ rootlibexec_PROGRAMS = \ systemd-kmsg-syslogd \ systemd-vconsole-setup \ systemd-reply-password \ - systemd-readahead-collect \ - systemd-readahead-replay \ systemd-user-sessions \ systemd-fsck \ systemd-quotacheck \ @@ -207,9 +207,6 @@ systemgenerator_PROGRAMS += \ systemd-cryptsetup-generator endif -lib_LTLIBRARIES = \ - libsystemd-daemon.la - noinst_PROGRAMS = \ test-engine \ test-job-type \ @@ -314,7 +311,6 @@ dist_systemunit_DATA = \ units/sound.target \ units/bluetooth.target \ units/smartcard.target \ - units/systemd-readahead-done.timer \ units/systemd-tmpfiles-clean.timer \ units/quotaon.service \ units/systemd-ask-password-wall.path \ @@ -341,9 +337,6 @@ nodist_systemunit_DATA = \ units/systemd-update-utmp-shutdown.service \ units/systemd-random-seed-save.service \ units/systemd-random-seed-load.service \ - units/systemd-readahead-collect.service \ - units/systemd-readahead-replay.service \ - units/systemd-readahead-done.service \ units/systemd-tmpfiles-setup.service \ units/systemd-tmpfiles-clean.service \ units/systemd-user-sessions.service \ @@ -383,9 +376,6 @@ EXTRA_DIST += \ units/systemd-update-utmp-shutdown.service.in \ units/systemd-random-seed-save.service.in \ units/systemd-random-seed-load.service.in \ - units/systemd-readahead-collect.service.in \ - units/systemd-readahead-replay.service.in \ - units/systemd-readahead-done.service.in \ units/systemd-tmpfiles-setup.service.in \ units/systemd-tmpfiles-clean.service.in \ units/systemd-user-sessions.service.in \ @@ -402,8 +392,6 @@ EXTRA_DIST += \ units/quotacheck.service.in \ units/user@.service.in \ systemd.pc.in \ - libsystemd-daemon.pc.in \ - src/libsystemd-daemon.sym \ introspect.awk \ src/73-seat-late.rules.in \ src/99-systemd.rules.in \ @@ -471,18 +459,11 @@ endif dist_doc_DATA = \ README \ LICENSE \ - DISTRO_PORTING \ - src/sd-daemon.h \ - src/sd-daemon.c \ - src/sd-readahead.h \ - src/sd-readahead.c + DISTRO_PORTING pkgconfigdata_DATA = \ systemd.pc -pkgconfiglib_DATA = \ - libsystemd-daemon.pc - # First passed through sed, followed by intltool polkitpolicy_in_in_files = \ src/org.freedesktop.systemd1.policy.in.in @@ -617,7 +598,6 @@ EXTRA_DIST += \ src/linux/auto_dev-ioctl.h \ src/linux/fanotify.h \ src/initreq.h \ - src/sd-readahead.h \ src/special.h \ src/dbus-common.h \ src/bus-errors.h \ @@ -625,7 +605,6 @@ EXTRA_DIST += \ src/build.h \ src/shutdownd.h \ src/umount.h \ - src/readahead-common.h \ src/ask-password-api.h \ src/pager.h \ src/sysfs-show.h \ @@ -642,11 +621,6 @@ MANPAGES = \ man/systemd-nspawn.1 \ man/systemd-tmpfiles.8 \ man/systemd-notify.1 \ - man/sd_notify.3 \ - man/sd_readahead.3 \ - man/sd_booted.3 \ - man/sd_listen_fds.3 \ - man/sd_is_fifo.3 \ man/systemd.unit.5 \ man/systemd.service.5 \ man/systemd.socket.5 \ @@ -660,8 +634,6 @@ MANPAGES = \ man/systemd.snapshot.5 \ man/systemd.exec.5 \ man/daemon.7 \ - man/sd-daemon.7 \ - man/sd-readahead.7 \ man/runlevel.8 \ man/telinit.8 \ man/halt.8 \ @@ -678,51 +650,16 @@ MANPAGES = \ man/machine-info.5 \ man/modules-load.d.5 \ man/sysctl.d.5 \ - man/systemd-ask-password.1 \ - man/sd_pid_get_session.3 \ - man/sd_uid_get_state.3 \ - man/sd_session_is_active.3 \ - man/sd_seat_get_active.3 \ - man/sd_get_seats.3 + man/systemd-ask-password.1 MANPAGES_ALIAS = \ man/reboot.8 \ man/poweroff.8 \ - man/sd_is_socket.3 \ - man/sd_is_socket_unix.3 \ - man/sd_is_socket_inet.3 \ - man/sd_is_mq.3 \ - man/sd_notifyf.3 \ - man/init.1 \ - man/sd_session_get_uid.3 \ - man/sd_session_get_seat.3 \ - man/sd_pid_get_owner_uid.3 \ - man/sd_uid_is_on_seat.3 \ - man/sd_uid_get_sessions.3 \ - man/sd_uid_get_seats.3 \ - man/sd_seat_get_sessions.3 \ - man/sd_seat_can_multi_session.3 \ - man/sd_get_sessions.3 \ - man/sd_get_uids.3 + man/init.1 man/reboot.8: man/halt.8 man/poweroff.8: man/halt.8 -man/sd_is_socket.3: man/sd_is_fifo.3 -man/sd_is_socket_unix.3: man/sd_is_fifo.3 -man/sd_is_socket_inet.3: man/sd_is_fifo.3 -man/sd_is_mq.3: man/sd_is_fifo.3 -man/sd_notifyf.3: man/sd_notify.3 man/init.1: man/systemd.1 -man/sd_session_get_uid.3: man/sd_session_is_active.3 -man/sd_session_get_seat.3: man/sd_session_is_active.3 -man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3 -man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3 -man/sd_uid_get_sessions.3: man/sd_uid_get_state.3 -man/sd_uid_get_seats.3: man/sd_uid_get_state.3 -man/sd_seat_get_sessions.3: man/sd_seat_get_active.3 -man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3 -man/sd_get_sessions.3: man/sd_get_seats.3 -man/sd_get_uids.3: man/sd_get_seats.3 dist_man_MANS = \ $(MANPAGES) \ @@ -803,18 +740,12 @@ test_cgroup_SOURCES = \ src/test-cgroup.c \ src/cgroup-util.c -test_cgroup_CFLAGS = \ - $(AM_CFLAGS) - test_cgroup_LDADD = \ libsystemd-basic.la test_env_replace_SOURCES = \ src/test-env-replace.c -test_env_replace_CFLAGS = \ - $(AM_CFLAGS) - test_env_replace_LDADD = \ libsystemd-basic.la @@ -822,9 +753,6 @@ test_strv_SOURCES = \ src/test-strv.c \ src/specifier.c -test_strv_CFLAGS = \ - $(AM_CFLAGS) - test_strv_LDADD = \ libsystemd-basic.la @@ -881,9 +809,6 @@ systemd_update_utmp_LDADD = \ systemd_random_seed_SOURCES = \ src/random-seed.c -systemd_random_seed_CFLAGS = \ - $(AM_CFLAGS) - systemd_random_seed_LDADD = \ libsystemd-basic.la @@ -920,18 +845,12 @@ systemd_shutdown_LDADD = \ systemd_modules_load_SOURCES = \ src/modules-load.c -systemd_modules_load_CFLAGS = \ - $(AM_CFLAGS) - systemd_modules_load_LDADD = \ libsystemd-basic.la systemd_tmpfiles_SOURCES = \ src/tmpfiles.c -systemd_tmpfiles_CFLAGS = \ - $(AM_CFLAGS) - systemd_tmpfiles_LDADD = \ libsystemd-basic.la @@ -940,18 +859,12 @@ systemd_machine_id_setup_SOURCES = \ src/machine-id-main.c \ src/sd-id128.c -systemd_machine_id_setup_CFLAGS = \ - $(AM_CFLAGS) - systemd_machine_id_setup_LDADD = \ libsystemd-basic.la systemd_sysctl_SOURCES = \ src/sysctl.c -systemd_sysctl_CFLAGS = \ - $(AM_CFLAGS) - systemd_sysctl_LDADD = \ libsystemd-basic.la @@ -972,18 +885,12 @@ systemd_fsck_LDADD = \ systemd_quotacheck_SOURCES = \ src/quotacheck.c -systemd_quotacheck_CFLAGS = \ - $(AM_CFLAGS) - systemd_quotacheck_LDADD = \ libsystemd-basic.la systemd_timestamp_SOURCES = \ src/timestamp.c -systemd_timestamp_CFLAGS = \ - $(AM_CFLAGS) - systemd_timestamp_LDADD = \ libsystemd-basic.la @@ -1001,9 +908,6 @@ systemd_ac_power_LDADD = \ systemd_detect_virt_SOURCES = \ src/detect-virt.c -systemd_detect_virt_CFLAGS = \ - $(AM_CFLAGS) - systemd_detect_virt_LDADD = \ libsystemd-basic.la @@ -1012,9 +916,9 @@ systemd_cryptsetup_SOURCES = \ src/ask-password-api.c systemd_cryptsetup_CFLAGS = \ + $(AM_CFLAGS) \ $(LIBCRYPTSETUP_CFLAGS) \ - $(UDEV_CFLAGS) \ - $(AM_CFLAGS) + $(UDEV_CFLAGS) systemd_cryptsetup_LDADD = \ $(LIBCRYPTSETUP_LIBS) \ @@ -1025,9 +929,6 @@ systemd_cryptsetup_generator_SOURCES = \ src/cryptsetup-generator.c \ src/unit-name.c -systemd_cryptsetup_generator_CFLAGS = \ - $(AM_CFLAGS) - systemd_cryptsetup_generator_LDADD = \ libsystemd-basic.la @@ -1035,18 +936,12 @@ systemd_getty_generator_SOURCES = \ src/getty-generator.c \ src/unit-name.c -systemd_getty_generator_CFLAGS = \ - $(AM_CFLAGS) - systemd_getty_generator_LDADD = \ libsystemd-basic.la systemd_rc_local_generator_SOURCES = \ src/rc-local-generator.c -systemd_rc_local_generator_CFLAGS = \ - $(AM_CFLAGS) - systemd_rc_local_generator_LDADD = \ libsystemd-basic.la @@ -1054,18 +949,12 @@ systemd_user_sessions_SOURCES = \ src/user-sessions.c \ src/cgroup-util.c -systemd_user_sessions_CFLAGS = \ - $(AM_CFLAGS) - systemd_user_sessions_LDADD = \ libsystemd-basic.la systemd_vconsole_setup_SOURCES = \ src/vconsole-setup.c -systemd_vconsole_setup_CFLAGS = \ - $(AM_CFLAGS) - systemd_vconsole_setup_LDADD = \ libsystemd-basic.la @@ -1074,9 +963,6 @@ systemd_remount_api_vfs_SOURCES = \ src/mount-setup.c \ src/exit-status.c -systemd_remount_api_vfs_CFLAGS = \ - $(AM_CFLAGS) - systemd_remount_api_vfs_LDADD = \ libsystemd-basic.la @@ -1096,9 +982,6 @@ systemd_kmsg_syslogd_SOURCES = \ src/kmsg-syslogd.c \ src/fdset.c -systemd_kmsg_syslogd_CFLAGS = \ - $(AM_CFLAGS) - systemd_kmsg_syslogd_LDADD = \ libsystemd-basic.la \ libsystemd-daemon.la @@ -1146,39 +1029,12 @@ systemd_reply_password_SOURCES = \ systemd_reply_password_LDADD = \ libsystemd-basic.la -systemd_readahead_collect_SOURCES = \ - src/readahead-collect.c \ - src/readahead-common.c - -systemd_readahead_collect_CFLAGS = \ - $(UDEV_CFLAGS) - -systemd_readahead_collect_LDADD = \ - libsystemd-basic.la \ - libsystemd-daemon.la \ - $(UDEV_LIBS) - -systemd_readahead_replay_SOURCES = \ - src/readahead-replay.c \ - src/readahead-common.c - -systemd_readahead_replay_CFLAGS = \ - $(UDEV_CFLAGS) - -systemd_readahead_replay_LDADD = \ - libsystemd-basic.la \ - libsystemd-daemon.la \ - $(UDEV_LIBS) - systemd_cgls_SOURCES = \ src/cgls.c \ src/cgroup-show.c \ src/cgroup-util.c \ src/pager.c -systemd_cgls_CFLAGS = \ - $(AM_CFLAGS) - systemd_cgls_LDADD = \ libsystemd-basic.la @@ -1187,9 +1043,6 @@ systemd_nspawn_SOURCES = \ src/cgroup-util.c \ src/loopback-setup.c -systemd_nspawn_CFLAGS = \ - $(AM_CFLAGS) - systemd_nspawn_LDADD = \ libsystemd-basic.la \ libsystemd-daemon.la @@ -1259,6 +1112,56 @@ systemd_tty_ask_password_agent_SOURCES = \ systemd_tty_ask_password_agent_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ +systemd_readahead_collect_SOURCES = \ + src/readahead-collect.c \ + src/readahead-common.c + +systemd_readahead_collect_LDADD = \ + libsystemd-basic.la \ + libsystemd-daemon.la \ + $(UDEV_LIBS) + +systemd_readahead_replay_SOURCES = \ + src/readahead-replay.c \ + src/readahead-common.c + +systemd_readahead_replay_CFLAGS = \ + $(AM_CFLAGS) \ + $(UDEV_CFLAGS) + +systemd_readahead_replay_LDADD = \ + libsystemd-basic.la \ + libsystemd-daemon.la \ + $(UDEV_LIBS) + +rootlibexec_PROGRAMS += \ + systemd-readahead-collect \ + systemd-readahead-replay + +dist_systemunit_DATA += \ + units/systemd-readahead-done.timer + +nodist_systemunit_DATA += \ + units/systemd-readahead-collect.service \ + units/systemd-readahead-replay.service \ + units/systemd-readahead-done.service + +EXTRA_DIST += \ + src/sd-readahead.h \ + src/readahead-common.h \ + units/systemd-readahead-collect.service.in \ + units/systemd-readahead-replay.service.in \ + units/systemd-readahead-done.service.in + +dist_doc_DATA += \ + src/sd-readahead.h \ + src/sd-readahead.c + +MANPAGES += \ + man/sd_readahead.3 \ + man/sd-readahead.7 + # ------------------------------------------------------------------------------ libsystemd_daemon_la_SOURCES = \ src/sd-daemon.c @@ -1295,8 +1198,40 @@ libsystemd-daemon-uninstall-hook: UNINSTALL_EXEC_HOOKS += \ libsystemd-daemon-uninstall-hook +lib_LTLIBRARIES += \ + libsystemd-daemon.la + +pkgconfiglib_DATA += \ + libsystemd-daemon.pc + +dist_doc_DATA += \ + src/sd-daemon.h \ + src/sd-daemon.c + +MANPAGES += \ + man/sd-daemon.7 \ + man/sd_notify.3 \ + man/sd_listen_fds.3 \ + man/sd_is_fifo.3 \ + man/sd_booted.3 + +MANPAGES_ALIAS += \ + man/sd_is_socket.3 \ + man/sd_is_socket_unix.3 \ + man/sd_is_socket_inet.3 \ + man/sd_is_mq.3 \ + man/sd_notifyf.3 + +man/sd_is_socket.3: man/sd_is_fifo.3 +man/sd_is_socket_unix.3: man/sd_is_fifo.3 +man/sd_is_socket_inet.3: man/sd_is_fifo.3 +man/sd_is_mq.3: man/sd_is_fifo.3 +man/sd_notifyf.3: man/sd_notify.3 + EXTRA_DIST += \ - ${libsystemd_daemon_la_SOURCES:.c=.h} + ${libsystemd_daemon_la_SOURCES:.c=.h} \ + libsystemd-daemon.pc.in \ + src/libsystemd-daemon.sym # ------------------------------------------------------------------------------ libsystemd_id128_la_SOURCES = \ @@ -1318,9 +1253,6 @@ test_id128_SOURCES = \ src/test-id128.c \ src/sd-id128.c -test_id128_CFLAGS = \ - $(AM_CFLAGS) - test_id128_LDADD = \ libsystemd-basic.la @@ -1396,16 +1328,13 @@ systemd_journalctl_SOURCES = \ src/sd-id128.c \ src/pager.c -systemd_journalctl_CFLAGS = \ - $(AM_CFLAGS) - systemd_journalctl_LDADD = \ libsystemd-basic.la if HAVE_XZ systemd_journalctl_SOURCES += \ src/journal/compress.c -systemd_journalctl_CFLAGS += \ +systemd_journalctl_CFLAGS = \ $(XZ_CFLAGS) systemd_journalctl_LDADD += \ $(XZ_LIBS) @@ -1867,7 +1796,7 @@ lib_LTLIBRARIES += \ libsystemd-login.la pkgconfiglib_DATA += \ - libsystemd-login.pc + src/login/libsystemd-login.pc polkitpolicy_in_files += \ src/login/org.freedesktop.login1.policy.in @@ -1914,21 +1843,46 @@ MANPAGES += \ man/systemd-logind.conf.5 \ man/sd-login.7 \ man/systemd-loginctl.1 \ - man/sd_login_monitor_new.3 + man/sd_login_monitor_new.3 \ + man/sd_pid_get_session.3 \ + man/sd_uid_get_state.3 \ + man/sd_session_is_active.3 \ + man/sd_seat_get_active.3 \ + man/sd_get_seats.3 MANPAGES_ALIAS += \ man/sd_login_monitor_unref.3 \ man/sd_login_monitor_flush.3 \ - man/sd_login_monitor_get_fd.3 + man/sd_login_monitor_get_fd.3 \ + man/sd_session_get_uid.3 \ + man/sd_session_get_seat.3 \ + man/sd_pid_get_owner_uid.3 \ + man/sd_uid_is_on_seat.3 \ + man/sd_uid_get_sessions.3 \ + man/sd_uid_get_seats.3 \ + man/sd_seat_get_sessions.3 \ + man/sd_seat_can_multi_session.3 \ + man/sd_get_sessions.3 \ + man/sd_get_uids.3 man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3 man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3 man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3 +man/sd_session_get_uid.3: man/sd_session_is_active.3 +man/sd_session_get_seat.3: man/sd_session_is_active.3 +man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3 +man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3 +man/sd_uid_get_sessions.3: man/sd_uid_get_state.3 +man/sd_uid_get_seats.3: man/sd_uid_get_state.3 +man/sd_seat_get_sessions.3: man/sd_seat_get_active.3 +man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3 +man/sd_get_sessions.3: man/sd_get_seats.3 +man/sd_get_uids.3: man/sd_get_seats.3 EXTRA_DIST += \ src/login/logind-gperf.gperf \ units/systemd-logind.service.in \ - libsystemd-login.pc.in \ + src/login/libsystemd-login.pc.in \ src/login/libsystemd-login.sym \ src/login/logind.h \ src/login/logind-device.h \