X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=8f56d2549605e6af6771cb25a13edf0a55161a05;hp=3cb50d854cc44f4027b299ae71e9b1eee8d602af;hb=2d13da8821b8197e62f819b5b996750800e910ab;hpb=9cf2578683de834026f501c24a0f5d3d0991d0a6

diff --git a/Makefile.am b/Makefile.am
index 3cb50d854..8f56d2549 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 = \
@@ -231,7 +229,8 @@ noinst_PROGRAMS = \
 	test-cgroup \
 	test-env-replace \
 	test-strv \
-	test-install
+	test-install \
+        test-watchdog
 
 dist_pkgsysconf_DATA = \
 	src/system.conf \
@@ -477,17 +476,29 @@ noinst_LTLIBRARIES = \
 
 libsystemd_basic_la_SOURCES = \
 	src/util.c \
+	src/util.h \
 	src/virt.c \
+	src/virt.h \
 	src/label.c \
+	src/label.h \
 	src/hashmap.c \
+	src/hashmap.h \
 	src/set.c \
+	src/set.h \
 	src/strv.c \
+	src/strv.h \
 	src/conf-parser.c \
+	src/conf-parser.h \
 	src/socket-util.c \
+	src/socket-util.h \
 	src/log.c \
+	src/log.h \
+	src/ratelimit.h \
 	src/ratelimit.c \
 	src/exit-status.c \
-        src/utf8.c
+	src/exit-status.h \
+	src/utf8.c \
+	src/utf8.h
 
 libsystemd_basic_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -499,152 +510,113 @@ libsystemd_basic_la_LIBADD = \
 
 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/specifier.c \
-	src/unit-name.c \
+	src/machine-id-setup.h \
 	src/fdset.c \
-	src/namespace.c \
-	src/tcpwrap.c \
+	src/fdset.h \
 	src/cgroup-util.c \
+	src/cgroup-util.h \
 	src/condition.c \
+	src/condition.h \
 	src/dbus-common.c \
-	src/sd-daemon.c \
+	src/dbus-common.h \
 	src/install.c \
-	src/cgroup-attr.c \
-	src/sd-id128.c
-
-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)
-
-# 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.
-
-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 \
-	src/unit.h \
-	src/job.h \
-	src/manager.h \
-	src/path-lookup.h \
-	src/load-fragment.h \
-	src/service.h \
-	src/automount.h \
-	src/mount.h \
-	src/swap.h \
-	src/device.h \
-	src/target.h \
-	src/snapshot.h \
-	src/socket.h \
-	src/timer.h \
-	src/path.h \
-	src/load-dropin.h \
-	src/execute.h \
-	src/utmp-wtmp.h \
-	src/dbus.h \
-	src/dbus-manager.h \
-	src/dbus-unit.h \
-	src/dbus-job.h \
-	src/dbus-service.h \
-	src/dbus-socket.h \
-	src/dbus-timer.h \
-	src/dbus-target.h \
-	src/dbus-mount.h \
-	src/dbus-automount.h \
-	src/dbus-swap.h \
-	src/dbus-snapshot.h \
-	src/dbus-device.h \
-	src/dbus-execute.h \
-	src/dbus-path.h \
-	src/cgroup.h \
-	src/mount-setup.h \
-	src/hostname-setup.h \
-	src/selinux-setup.h \
-	src/loopback-setup.h \
-	src/kmod-setup.h \
-	src/locale-setup.h \
-	src/machine-id-setup.h \
+	src/install.h \
+	src/specifier.c \
 	src/specifier.h \
-	src/unit-name.h \
-	src/fdset.h \
+	src/namespace.c \
 	src/namespace.h \
+	src/unit-name.c \
+	src/unit-name.h \
+	src/tcpwrap.c \
 	src/tcpwrap.h \
-	src/cgroup-util.h \
-	src/condition.h \
-	src/dbus-common.h \
-	src/install.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 \
@@ -668,10 +640,32 @@ EXTRA_DIST += \
 	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 \
@@ -829,6 +823,14 @@ 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
@@ -871,7 +873,9 @@ 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 \
@@ -1196,7 +1200,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 \
@@ -1268,7 +1271,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) \
@@ -1284,17 +1289,30 @@ 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 \
+	src/acl-util.c
+
+udev_common_CFLAGS += \
+	$(ACL_CFLAGS)
+
+udev_common_LDADD += \
+	libsystemd-login.la \
+	$(ACL_LIBS)
+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)
@@ -1314,7 +1332,8 @@ udevadm_CFLAGS = \
 	$(udev_common_CFLAGS)
 
 udevadm_LDADD = \
-	$(udev_common_LDADD)
+	$(udev_common_LDADD) \
+	libsystemd-basic.la
 
 udevadm_CPPFLAGS = \
 	$(udev_common_CPPFLAGS)
@@ -1342,7 +1361,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)
@@ -1368,7 +1388,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
@@ -1378,7 +1399,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
@@ -1404,7 +1426,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
@@ -1430,7 +1453,8 @@ accelerometer_SOURCES = \
 	src/udev/accelerometer/accelerometer.c
 
 accelerometer_LDADD = \
-	libudev-private.la -lm
+	libudev-private.la -lm \
+	libsystemd-basic.la
 
 udevlibexec_PROGRAMS += \
 	accelerometer
@@ -1623,21 +1647,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 = \
@@ -1806,6 +1826,7 @@ 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
 
@@ -2590,29 +2611,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