X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=789e4420f3023be30903d1ca051bb47ad65c875e;hb=78b2e3a632748fbeae8a9eb70ab1940e4a70619a;hp=74e14d2f2a8ebf7f50c3468633ba862fd0edc1c9;hpb=3e2147858f21943d5f4a781c60f33ac22c6096ed;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 74e14d2f2..789e4420f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ AM_MAKEFLAGS = --no-print-directory SUBDIRS = . po LIBUDEV_CURRENT=13 -LIBUDEV_REVISION=2 +LIBUDEV_REVISION=3 LIBUDEV_AGE=13 LIBGUDEV_CURRENT=1 @@ -63,15 +63,17 @@ tmpfilesdir=$(prefix)/lib/tmpfiles.d sysctldir=$(prefix)/lib/sysctl.d usergeneratordir=$(pkglibexecdir)/user-generators pkgincludedir=$(includedir)/systemd +systemgeneratordir=$(rootlibexecdir)/system-generators +systemshutdowndir=$(rootlibexecdir)/system-shutdown +systemunitdir=$(rootprefix)/lib/systemd/system udevlibexecdir=$(rootprefix)/lib/udev +udevhomedir = $(libexecdir)/udev +udevrulesdir = $(libexecdir)/udev/rules.d # And these are the special ones for / rootprefix=@rootprefix@ rootbindir=$(rootprefix)/bin rootlibexecdir=$(rootprefix)/lib/systemd -systemgeneratordir=$(rootlibexecdir)/system-generators -systemshutdowndir=$(rootlibexecdir)/system-shutdown -systemunitdir=$(rootprefix)/lib/systemd/system CLEANFILES = EXTRA_DIST = @@ -88,10 +90,6 @@ pkgconfiglib_DATA = polkitpolicy_in_files = dist_udevrules_DATA = nodist_udevrules_DATA = -udevhomedir = $(libexecdir)/udev -udevhome_SCRIPTS = -dist_udevhome_SCRIPTS = -dist_udevhome_DATA = dist_man_MANS = AM_CPPFLAGS = \ @@ -122,6 +120,7 @@ AM_CPPFLAGS = \ -DX_SERVER=\"$(bindir)/X\" \ -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \ -I $(top_srcdir)/src \ + -I $(top_srcdir)/src/shared \ -I $(top_srcdir)/src/readahead \ -I $(top_srcdir)/src/login \ -I $(top_srcdir)/src/journal \ @@ -131,6 +130,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = $(WARNINGFLAGS) AM_LDFLAGS = $(GCLDFLAGS) +# ------------------------------------------------------------------------------ if TARGET_GENTOO AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ @@ -185,6 +185,7 @@ endif endif endif +# ------------------------------------------------------------------------------ rootbin_PROGRAMS = \ systemctl \ systemd-notify \ @@ -231,7 +232,8 @@ noinst_PROGRAMS = \ test-cgroup \ test-env-replace \ test-strv \ - test-install + test-install \ + test-watchdog dist_pkgsysconf_DATA = \ src/system.conf \ @@ -338,6 +340,7 @@ nodist_systemunit_DATA = \ units/systemd-ask-password-console.service \ units/systemd-sysctl.service \ units/halt.service \ + units/emergency.service \ units/poweroff.service \ units/reboot.service \ units/kexec.service \ @@ -359,8 +362,8 @@ nodist_userunit_DATA = \ EXTRA_DIST += \ units/getty@.service.m4 \ units/serial-getty@.service.m4 \ - units/console-shell.service.m4 \ - units/rescue.service.m4 \ + units/console-shell.service.m4.in \ + units/rescue.service.m4.in \ units/systemd-initctl.service.in \ units/systemd-shutdownd.service.in \ units/systemd-modules-load.service.in \ @@ -372,6 +375,7 @@ EXTRA_DIST += \ units/systemd-ask-password-wall.service.in \ units/systemd-ask-password-console.service.in \ units/systemd-sysctl.service.in \ + units/emergency.service.in \ units/halt.service.in \ units/poweroff.service.in \ units/reboot.service.in \ @@ -471,178 +475,188 @@ EXTRA_DIST += \ noinst_LTLIBRARIES = \ libsystemd-basic.la \ + libsystemd-capability.la \ + libsystemd-audit.la \ + libsystemd-acl.la \ libsystemd-core.la +# ------------------------------------------------------------------------------ libsystemd_basic_la_SOURCES = \ - src/util.c \ - src/virt.c \ - src/label.c \ - src/hashmap.c \ - src/set.c \ - src/strv.c \ - src/conf-parser.c \ - src/socket-util.c \ - src/log.c \ - src/ratelimit.c \ - src/exit-status.c \ - src/utf8.c + src/shared/util.c \ + src/shared/util.h \ + src/shared/virt.c \ + src/shared/virt.h \ + src/shared/label.c \ + src/shared/label.h \ + src/shared/hashmap.c \ + src/shared/hashmap.h \ + src/shared/set.c \ + src/shared/set.h \ + src/shared/strv.c \ + src/shared/strv.h \ + src/shared/conf-parser.c \ + src/shared/conf-parser.h \ + src/shared/socket-util.c \ + src/shared/socket-util.h \ + src/shared/log.c \ + src/shared/log.h \ + src/shared/ratelimit.h \ + src/shared/ratelimit.c \ + src/shared/exit-status.c \ + src/shared/exit-status.h \ + src/shared/utf8.c \ + src/shared/utf8.h libsystemd_basic_la_CFLAGS = \ $(AM_CFLAGS) \ $(SELINUX_CFLAGS) libsystemd_basic_la_LIBADD = \ - $(SELINUX_LIBS) \ + libsystemd-capability.la \ + $(SELINUX_LIBS) + +# ------------------------------------------------------------------------------ +libsystemd_capability_la_SOURCES = \ + src/shared/capability.c \ + src/shared/capability.h + +libsystemd_capability_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CAP_CFLAGS) + +libsystemd_capability_la_LIBADD = \ $(CAP_LIBS) -libsystemd_core_la_SOURCES = \ - src/unit.c \ - src/job.c \ - src/manager.c \ - src/path-lookup.c \ - src/load-fragment.c \ - src/service.c \ - src/automount.c \ - src/mount.c \ - src/swap.c \ - src/device.c \ - src/target.c \ - src/snapshot.c \ - src/socket.c \ - src/timer.c \ - src/path.c \ - src/load-dropin.c \ - src/execute.c \ - src/utmp-wtmp.c \ - src/dbus.c \ - src/dbus-manager.c \ - src/dbus-unit.c \ - src/dbus-job.c \ - src/dbus-service.c \ - src/dbus-socket.c \ - src/dbus-timer.c \ - src/dbus-target.c \ - src/dbus-mount.c \ - src/dbus-automount.c \ - src/dbus-swap.c \ - src/dbus-snapshot.c \ - src/dbus-device.c \ - src/dbus-execute.c \ - src/dbus-path.c \ - src/cgroup.c \ - src/mount-setup.c \ - src/hostname-setup.c \ - src/selinux-setup.c \ - src/ima-setup.c \ - src/loopback-setup.c \ - src/kmod-setup.c \ - src/locale-setup.c \ - src/machine-id-setup.c \ - src/specifier.c \ - src/unit-name.c \ - src/fdset.c \ - src/namespace.c \ - src/tcpwrap.c \ - src/cgroup-util.c \ - src/condition.c \ - src/dbus-common.c \ - src/sd-daemon.c \ - src/install.c \ - src/cgroup-attr.c \ - src/sd-id128.c +# ------------------------------------------------------------------------------ +libsystemd_audit_la_SOURCES = \ + src/shared/audit.c \ + src/shared/audit.h -nodist_libsystemd_core_la_SOURCES = \ - src/load-fragment-gperf.c \ - src/load-fragment-gperf-nulstr.c +libsystemd_audit_la_LIBADD = \ + libsystemd-capability.la -EXTRA_DIST += \ - src/load-fragment-gperf.gperf.m4 +# ------------------------------------------------------------------------------ +libsystemd_acl_la_SOURCES = \ + src/shared/acl.c \ + src/shared/acl.h -libsystemd_core_la_CFLAGS = \ +libsystemd_acl_la_CFLAGS = \ $(AM_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(LIBWRAP_CFLAGS) \ - $(PAM_CFLAGS) \ - $(AUDIT_CFLAGS) \ - $(KMOD_CFLAGS) - -libsystemd_core_la_LIBADD = \ - libsystemd-basic.la \ - libudev.la \ - $(DBUS_LIBS) \ - $(LIBWRAP_LIBS) \ - $(PAM_LIBS) \ - $(AUDIT_LIBS) \ - $(CAP_LIBS) \ - $(KMOD_LIBS) + $(ACL_CFLAGS) -# This is needed because automake is buggy in how it generates the -# rules for C programs, but not Vala programs. We therefore can't -# list the .h files as dependencies if we want make dist to work. +libsystemd_acl_la_LIBADD = \ + $(ACL_LIBS) -EXTRA_DIST += \ - src/util.h \ - src/virt.h \ - src/label.h \ - src/hashmap.h \ - src/set.h \ - src/strv.h \ - src/conf-parser.h \ - src/socket-util.h \ - src/log.h \ - src/ratelimit.h \ - src/exit-status.h \ +# ------------------------------------------------------------------------------ +libsystemd_core_la_SOURCES = \ + src/unit.c \ src/unit.h \ + src/job.c \ src/job.h \ + src/manager.c \ src/manager.h \ + src/path-lookup.c \ src/path-lookup.h \ + src/load-fragment.c \ src/load-fragment.h \ + src/service.c \ src/service.h \ + src/automount.c \ src/automount.h \ + src/mount.c \ src/mount.h \ + src/swap.c \ src/swap.h \ + src/device.c \ src/device.h \ + src/target.c \ src/target.h \ + src/snapshot.c \ src/snapshot.h \ + src/socket.c \ src/socket.h \ + src/timer.c \ src/timer.h \ + src/path.c \ src/path.h \ + src/load-dropin.c \ src/load-dropin.h \ + src/execute.c \ src/execute.h \ + src/utmp-wtmp.c \ src/utmp-wtmp.h \ + src/dbus.c \ src/dbus.h \ + src/dbus-manager.c \ src/dbus-manager.h \ + src/dbus-unit.c \ src/dbus-unit.h \ + src/dbus-job.c \ src/dbus-job.h \ + src/dbus-service.c \ src/dbus-service.h \ + src/dbus-socket.c \ src/dbus-socket.h \ + src/dbus-timer.c \ src/dbus-timer.h \ + src/dbus-target.c \ src/dbus-target.h \ + src/dbus-mount.c \ src/dbus-mount.h \ + src/dbus-automount.c \ src/dbus-automount.h \ + src/dbus-swap.c \ src/dbus-swap.h \ + src/dbus-snapshot.c \ src/dbus-snapshot.h \ + src/dbus-device.c \ src/dbus-device.h \ + src/dbus-execute.c \ src/dbus-execute.h \ + src/dbus-path.c \ src/dbus-path.h \ + src/cgroup.c \ src/cgroup.h \ + src/mount-setup.c \ src/mount-setup.h \ + src/hostname-setup.c \ src/hostname-setup.h \ + src/selinux-setup.c \ src/selinux-setup.h \ + src/ima-setup.c \ + src/ima-setup.h \ src/loopback-setup.h \ + src/loopback-setup.c \ + src/kmod-setup.c \ src/kmod-setup.h \ src/locale-setup.h \ + src/locale-setup.c \ + src/machine-id-setup.c \ src/machine-id-setup.h \ - src/specifier.h \ - src/unit-name.h \ + src/fdset.c \ src/fdset.h \ - src/namespace.h \ - src/tcpwrap.h \ + src/cgroup-util.c \ src/cgroup-util.h \ + src/condition.c \ src/condition.h \ + src/dbus-common.c \ src/dbus-common.h \ + src/install.c \ src/install.h \ + src/specifier.c \ + src/specifier.h \ + src/namespace.c \ + src/namespace.h \ + src/unit-name.c \ + src/unit-name.h \ + src/tcpwrap.c \ + src/tcpwrap.h \ + src/cgroup-attr.c \ src/cgroup-attr.h \ + src/watchdog.c \ + src/watchdog.h \ + src/sd-daemon.c \ + src/sd-id128.c \ src/macro.h \ src/def.h \ src/ioprio.h \ @@ -665,12 +679,34 @@ EXTRA_DIST += \ src/polkit.h \ src/dbus-loop.h \ src/spawn-agent.h \ - src/acl-util.h \ - src/logs-show.h \ - src/utf8.h \ - src/journal/sparse-endian.h \ - src/ima-setup.h + src/logs-show.h + +nodist_libsystemd_core_la_SOURCES = \ + src/load-fragment-gperf.c \ + src/load-fragment-gperf-nulstr.c + +EXTRA_DIST += \ + src/load-fragment-gperf.gperf.m4 + +libsystemd_core_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(LIBWRAP_CFLAGS) \ + $(PAM_CFLAGS) \ + $(AUDIT_CFLAGS) \ + $(KMOD_CFLAGS) + +libsystemd_core_la_LIBADD = \ + libsystemd-basic.la \ + libudev.la \ + $(DBUS_LIBS) \ + $(LIBWRAP_LIBS) \ + $(PAM_LIBS) \ + $(AUDIT_LIBS) \ + $(CAP_LIBS) \ + $(KMOD_LIBS) +# ------------------------------------------------------------------------------ MANPAGES = \ man/systemd.1 \ man/systemctl.1 \ @@ -692,6 +728,7 @@ MANPAGES = \ man/systemd.snapshot.5 \ man/systemd.exec.5 \ man/systemd.special.7 \ + man/systemd.journal-fields.7 \ man/daemon.7 \ man/runlevel.8 \ man/telinit.8 \ @@ -744,6 +781,7 @@ EXTRA_DIST += \ $(MANPAGES) \ $(MANPAGES_ALIAS) +# ------------------------------------------------------------------------------ systemd_SOURCES = \ src/main.c @@ -754,6 +792,7 @@ systemd_CFLAGS = \ systemd_LDADD = \ libsystemd-core.la +# ------------------------------------------------------------------------------ test_engine_SOURCES = \ src/test-engine.c @@ -826,6 +865,15 @@ test_install_CFLAGS = \ test_install_LDADD = \ libsystemd-basic.la +test_watchdog_SOURCES = \ + src/test-watchdog.c \ + src/watchdog.c \ + src/watchdog.h + +test_watchdog_LDADD = \ + libsystemd-basic.la + +# ------------------------------------------------------------------------------ systemd_initctl_SOURCES = \ src/initctl.c \ src/dbus-common.c @@ -839,6 +887,7 @@ systemd_initctl_LDADD = \ libsystemd-daemon.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemd_update_utmp_SOURCES = \ src/update-utmp.c \ src/dbus-common.c \ @@ -854,6 +903,7 @@ systemd_update_utmp_LDADD = \ $(DBUS_LIBS) \ $(AUDIT_LIBS) +# ------------------------------------------------------------------------------ systemd_shutdownd_SOURCES = \ src/utmp-wtmp.c \ src/shutdownd.c @@ -868,12 +918,15 @@ systemd_shutdownd_LDADD = \ systemd_shutdown_SOURCES = \ src/mount-setup.c \ src/umount.c \ - src/shutdown.c + src/shutdown.c \ + src/watchdog.c \ + src/watchdog.h systemd_shutdown_LDADD = \ libsystemd-basic.la \ libudev.la +# ------------------------------------------------------------------------------ systemd_modules_load_SOURCES = \ src/modules-load.c @@ -884,12 +937,14 @@ systemd_modules_load_LDADD = \ libsystemd-basic.la \ $(KMOD_LIBS) +# ------------------------------------------------------------------------------ systemd_tmpfiles_SOURCES = \ src/tmpfiles.c systemd_tmpfiles_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_machine_id_setup_SOURCES = \ src/machine-id-setup.c \ src/machine-id-main.c \ @@ -898,12 +953,14 @@ systemd_machine_id_setup_SOURCES = \ systemd_machine_id_setup_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_sysctl_SOURCES = \ src/sysctl.c systemd_sysctl_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_fsck_SOURCES = \ src/fsck.c \ src/dbus-common.c @@ -917,12 +974,14 @@ systemd_fsck_LDADD = \ libudev.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemd_timestamp_SOURCES = \ src/timestamp.c systemd_timestamp_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_ac_power_SOURCES = \ src/ac-power.c @@ -930,12 +989,14 @@ systemd_ac_power_LDADD = \ libsystemd-basic.la \ libudev.la +# ------------------------------------------------------------------------------ systemd_detect_virt_SOURCES = \ src/detect-virt.c systemd_detect_virt_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_getty_generator_SOURCES = \ src/getty-generator.c \ src/unit-name.c @@ -943,20 +1004,22 @@ systemd_getty_generator_SOURCES = \ systemd_getty_generator_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_rc_local_generator_SOURCES = \ src/rc-local-generator.c systemd_rc_local_generator_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_remount_api_vfs_SOURCES = \ src/remount-api-vfs.c \ - src/mount-setup.c \ - src/exit-status.c + src/mount-setup.c systemd_remount_api_vfs_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_cgroups_agent_SOURCES = \ src/cgroups-agent.c \ src/dbus-common.c @@ -969,6 +1032,7 @@ systemd_cgroups_agent_LDADD = \ libsystemd-basic.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemctl_SOURCES = \ src/systemctl.c \ src/utmp-wtmp.c \ @@ -976,7 +1040,6 @@ systemctl_SOURCES = \ src/path-lookup.c \ src/cgroup-show.c \ src/cgroup-util.c \ - src/exit-status.c \ src/unit-name.c \ src/pager.c \ src/install.c \ @@ -994,6 +1057,7 @@ systemctl_LDADD = \ libsystemd-id128.la \ $(DBUS_LIBS) +# ------------------------------------------------------------------------------ systemd_notify_SOURCES = \ src/notify.c \ src/readahead/sd-readahead.c @@ -1002,6 +1066,7 @@ systemd_notify_LDADD = \ libsystemd-basic.la \ libsystemd-daemon.la +# ------------------------------------------------------------------------------ systemd_ask_password_SOURCES = \ src/ask-password.c \ src/ask-password-api.c @@ -1009,12 +1074,14 @@ systemd_ask_password_SOURCES = \ systemd_ask_password_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_reply_password_SOURCES = \ src/reply-password.c systemd_reply_password_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_cgls_SOURCES = \ src/cgls.c \ src/cgroup-show.c \ @@ -1024,6 +1091,7 @@ systemd_cgls_SOURCES = \ systemd_cgls_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_cgtop_SOURCES = \ src/cgtop.c \ src/cgroup-util.c @@ -1031,6 +1099,7 @@ systemd_cgtop_SOURCES = \ systemd_cgtop_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_nspawn_SOURCES = \ src/nspawn.c \ src/cgroup-util.c \ @@ -1038,14 +1107,17 @@ systemd_nspawn_SOURCES = \ systemd_nspawn_LDADD = \ libsystemd-basic.la \ + libsystemd-capability.la \ libsystemd-daemon.la +# ------------------------------------------------------------------------------ systemd_stdio_bridge_SOURCES = \ src/bridge.c systemd_stdio_bridge_LDADD = \ libsystemd-basic.la +# ------------------------------------------------------------------------------ systemd_tty_ask_password_agent_SOURCES = \ src/tty-ask-password-agent.c \ src/ask-password-api.c \ @@ -1151,8 +1223,12 @@ libudev_private_la_SOURCES =\ $(libudev_la_SOURCES) \ src/udev/libudev-util-private.c \ src/udev/libudev-device-private.c \ - src/udev/libudev-queue-private.c \ + src/udev/libudev-queue-private.c + +if HAVE_SELINUX +libudev_private_la_SOURCES +=\ src/udev/libudev-selinux-private.c +endif libudev_private_la_LIBADD = \ $(SELINUX_LIBS) @@ -1189,7 +1265,6 @@ udev-confdirs: INSTALL_DATA_HOOKS += udev-confdirs -udevrulesdir = $(libexecdir)/udev/rules.d dist_udevrules_DATA += \ rules/99-systemd.rules \ rules/42-usb-hid-pm.rules \ @@ -1261,7 +1336,9 @@ udev_common_sources = \ src/udev/udev-builtin-input_id.c \ src/udev/udev-builtin-kmod.c \ src/udev/udev-builtin-path_id.c \ - src/udev/udev-builtin-usb_id.c + src/udev/udev-builtin-usb_id.c \ + src/systemd/sd-daemon.h \ + src/sd-daemon.c udev_common_CFLAGS = \ $(BLKID_CFLAGS) \ @@ -1277,17 +1354,26 @@ udev_common_CPPFLAGS = \ -DFIRMWARE_PATH="$(FIRMWARE_PATH)" \ -DUSB_DATABASE=\"$(USB_DATABASE)\" -DPCI_DATABASE=\"$(PCI_DATABASE)\" +if HAVE_ACL +udev_common_sources += \ + src/udev/udev-builtin-uaccess.c \ + src/login/logind-acl.c + +udev_common_LDADD += \ + libsystemd-login.la \ + libsystemd-acl.la +endif + udevd_SOURCES = \ $(udev_common_sources) \ - src/udev/udevd.c \ - src/systemd/sd-daemon.h \ - src/sd-daemon.c + src/udev/udevd.c udevd_CFLAGS = \ $(udev_common_CFLAGS) udevd_LDADD = \ - $(udev_common_LDADD) + $(udev_common_LDADD) \ + libsystemd-basic.la udevd_CPPFLAGS = \ $(udev_common_CPPFLAGS) @@ -1307,7 +1393,8 @@ udevadm_CFLAGS = \ $(udev_common_CFLAGS) udevadm_LDADD = \ - $(udev_common_LDADD) + $(udev_common_LDADD) \ + libsystemd-basic.la udevadm_CPPFLAGS = \ $(udev_common_CPPFLAGS) @@ -1335,7 +1422,8 @@ test_udev_CFLAGS = \ $(udev_common_CFLAGS) test_udev_LDADD = \ - $(udev_common_LDADD) + $(udev_common_LDADD) \ + libsystemd-basic.la test_udev_CPPFLAGS = \ $(udev_common_CPPFLAGS) @@ -1361,7 +1449,8 @@ ata_id_SOURCES = \ src/udev/ata_id/ata_id.c ata_id_LDADD = \ - libudev-private.la + libudev-private.la \ + libsystemd-basic.la udevlibexec_PROGRAMS += \ ata_id @@ -1371,7 +1460,8 @@ cdrom_id_SOURCES = \ src/udev/cdrom_id/cdrom_id.c cdrom_id_LDADD = \ - libudev-private.la + libudev-private.la \ + libsystemd-basic.la udevlibexec_PROGRAMS += \ cdrom_id @@ -1397,7 +1487,8 @@ scsi_id_SOURCES =\ src/udev/scsi_id/scsi_id.h scsi_id_LDADD = \ - libudev-private.la + libudev-private.la \ + libsystemd-basic.la udevlibexec_PROGRAMS += \ scsi_id @@ -1423,7 +1514,8 @@ accelerometer_SOURCES = \ src/udev/accelerometer/accelerometer.c accelerometer_LDADD = \ - libudev-private.la -lm + libudev-private.la -lm \ + libsystemd-basic.la udevlibexec_PROGRAMS += \ accelerometer @@ -1616,21 +1708,17 @@ dist_udevrules_DATA += \ src/udev/keymap/95-keymap.rules \ src/udev/keymap/95-keyboard-force-release.rules -dist_udevhome_SCRIPTS += \ - src/udev/keymap/findkeyboards - -udevhome_SCRIPTS += \ +dist_udevhome_SCRIPTS = \ + src/udev/keymap/findkeyboards \ src/udev/keymap/keyboard-force-release.sh EXTRA_DIST += \ - src/udev/keymap/check-keymaps.sh \ - src/udev/keymap/keyboard-force-release.sh.in + src/udev/keymap/check-keymaps.sh CLEANFILES += \ $(nodist_keymap_SOURCES) \ src/udev/keymap/keys.txt \ - src/udev/keymap/keys-from-name.gperf \ - src/udev/keymap/keyboard-force-release.sh + src/udev/keymap/keys-from-name.gperf udevkeymapdir = $(libexecdir)/udev/keymaps dist_udevkeymap_DATA = \ @@ -1799,32 +1887,33 @@ systemd_journald_SOURCES = \ src/journal/journal-file.c \ src/journal/lookup3.c \ src/journal/journal-rate-limit.c \ + src/journal/sparse-endian.h \ src/sd-id128.c \ src/cgroup-util.c -if HAVE_ACL -systemd_journald_SOURCES += \ - src/acl-util.c -endif - nodist_systemd_journald_SOURCES = \ src/journal/journald-gperf.c -systemd_journald_CFLAGS = \ - $(AM_CFLAGS) \ - $(ACL_CFLAGS) +systemd_journald_CFLAGS = systemd_journald_LDADD = \ libsystemd-basic.la \ + libsystemd-audit.la \ libsystemd-daemon.la \ - libsystemd-login.la \ - $(ACL_LIBS) + libsystemd-login.la + +if HAVE_ACL +systemd_journald_LDADD += \ + libsystemd-acl.la +endif if HAVE_XZ systemd_journald_SOURCES += \ src/journal/compress.c + systemd_journald_CFLAGS += \ $(XZ_CFLAGS) + systemd_journald_LDADD += \ $(XZ_LIBS) endif @@ -2411,23 +2500,24 @@ systemd_logind_SOURCES = \ nodist_systemd_logind_SOURCES = \ src/login/logind-gperf.c -if HAVE_ACL -systemd_logind_SOURCES += \ - src/login/logind-acl.c \ - src/acl-util.c -endif - systemd_logind_CFLAGS = \ $(AM_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(ACL_CFLAGS) + $(DBUS_CFLAGS) systemd_logind_LDADD = \ libsystemd-basic.la \ + libsystemd-audit.la \ libsystemd-daemon.la \ libudev.la \ - $(DBUS_LIBS) \ - $(ACL_LIBS) + $(DBUS_LIBS) + +if HAVE_ACL +systemd_logind_SOURCES += \ + src/login/logind-acl.c + +systemd_logind_LDADD += \ + libsystemd-acl.la +endif systemd_user_sessions_SOURCES = \ src/login/user-sessions.c \ @@ -2583,29 +2673,6 @@ systemd_multi_seat_x_LDADD = \ rootlibexec_PROGRAMS += \ systemd-multi-seat-x -systemd_uaccess_SOURCES = \ - src/login/uaccess.c - -if HAVE_ACL -systemd_uaccess_SOURCES += \ - src/login/logind-acl.c \ - src/acl-util.c -endif - -systemd_uaccess_CFLAGS = \ - $(AM_CFLAGS) \ - $(ACL_CFLAGS) - -systemd_uaccess_LDADD = \ - libsystemd-basic.la \ - libsystemd-daemon.la \ - libsystemd-login.la \ - libudev.la \ - $(ACL_LIBS) - -rootlibexec_PROGRAMS += \ - systemd-uaccess - dist_udevrules_DATA += \ src/login/70-uaccess.rules