X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=d4b706eb3bd3035cfaa365aa1b28fd58c7ea24c1;hb=f1ff47be175bdcb8ed8512393fee9f9615501e24;hp=9d05c7c829426c15f9839db127903ed7ad63e0b5;hpb=8d62c69d9e4a3a0013310735ee2c1e746abea29a;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 9d05c7c82..d4b706eb3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -229,7 +229,8 @@ noinst_PROGRAMS = \
 	test-cgroup \
 	test-env-replace \
 	test-strv \
-	test-install
+	test-install \
+        test-watchdog
 
 dist_pkgsysconf_DATA = \
 	src/system.conf \
@@ -612,6 +613,8 @@ libsystemd_core_la_SOURCES = \
 	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 \
@@ -820,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
@@ -862,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 \
@@ -1284,7 +1297,8 @@ udevd_CFLAGS = \
 	$(udev_common_CFLAGS)
 
 udevd_LDADD = \
-	$(udev_common_LDADD)
+	$(udev_common_LDADD) \
+	libsystemd-basic.la
 
 udevd_CPPFLAGS = \
 	$(udev_common_CPPFLAGS)
@@ -1304,7 +1318,8 @@ udevadm_CFLAGS = \
 	$(udev_common_CFLAGS)
 
 udevadm_LDADD = \
-	$(udev_common_LDADD)
+	$(udev_common_LDADD) \
+	libsystemd-basic.la
 
 udevadm_CPPFLAGS = \
 	$(udev_common_CPPFLAGS)
@@ -1332,7 +1347,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)
@@ -1358,7 +1374,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
@@ -1368,7 +1385,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
@@ -1394,7 +1412,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
@@ -1420,7 +1439,8 @@ accelerometer_SOURCES = \
 	src/udev/accelerometer/accelerometer.c
 
 accelerometer_LDADD = \
-	libudev-private.la -lm
+	libudev-private.la -lm \
+	libsystemd-basic.la
 
 udevlibexec_PROGRAMS += \
 	accelerometer
@@ -1614,20 +1634,16 @@ dist_udevrules_DATA += \
 	src/udev/keymap/95-keyboard-force-release.rules
 
 dist_udevhome_SCRIPTS = \
-	src/udev/keymap/findkeyboards
-
-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 = \