chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: keymap: remove rootprefix mangling from script
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 48578bf2d7faa9c28d3c838a16b534853cfb96c4..d4b706eb3bd3035cfaa365aa1b28fd58c7ea24c1 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-229,7
+229,8
@@
noinst_PROGRAMS = \
test-cgroup \
test-env-replace \
test-strv \
test-cgroup \
test-env-replace \
test-strv \
- test-install
+ test-install \
+ test-watchdog
dist_pkgsysconf_DATA = \
src/system.conf \
dist_pkgsysconf_DATA = \
src/system.conf \
@@
-603,13
+604,19
@@
libsystemd_core_la_SOURCES = \
src/install.c \
src/install.h \
src/specifier.c \
src/install.c \
src/install.h \
src/specifier.c \
+ src/specifier.h \
src/namespace.c \
src/namespace.c \
+ src/namespace.h \
src/unit-name.c \
src/unit-name.c \
+ src/unit-name.h \
src/tcpwrap.c \
src/tcpwrap.c \
- src/
sd-daemon.c
\
+ src/
tcpwrap.h
\
src/cgroup-attr.c \
src/cgroup-attr.c \
- src/sd-id128.c \
src/cgroup-attr.h \
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 \
src/macro.h \
src/def.h \
src/ioprio.h \
@@
-816,6
+823,14
@@
test_install_CFLAGS = \
test_install_LDADD = \
libsystemd-basic.la
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
systemd_initctl_SOURCES = \
src/initctl.c \
src/dbus-common.c
@@
-858,7
+873,9
@@
systemd_shutdownd_LDADD = \
systemd_shutdown_SOURCES = \
src/mount-setup.c \
src/umount.c \
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 \
systemd_shutdown_LDADD = \
libsystemd-basic.la \
@@
-1280,7
+1297,8
@@
udevd_CFLAGS = \
$(udev_common_CFLAGS)
udevd_LDADD = \
$(udev_common_CFLAGS)
udevd_LDADD = \
- $(udev_common_LDADD)
+ $(udev_common_LDADD) \
+ libsystemd-basic.la
udevd_CPPFLAGS = \
$(udev_common_CPPFLAGS)
udevd_CPPFLAGS = \
$(udev_common_CPPFLAGS)
@@
-1300,7
+1318,8
@@
udevadm_CFLAGS = \
$(udev_common_CFLAGS)
udevadm_LDADD = \
$(udev_common_CFLAGS)
udevadm_LDADD = \
- $(udev_common_LDADD)
+ $(udev_common_LDADD) \
+ libsystemd-basic.la
udevadm_CPPFLAGS = \
$(udev_common_CPPFLAGS)
udevadm_CPPFLAGS = \
$(udev_common_CPPFLAGS)
@@
-1328,7
+1347,8
@@
test_udev_CFLAGS = \
$(udev_common_CFLAGS)
test_udev_LDADD = \
$(udev_common_CFLAGS)
test_udev_LDADD = \
- $(udev_common_LDADD)
+ $(udev_common_LDADD) \
+ libsystemd-basic.la
test_udev_CPPFLAGS = \
$(udev_common_CPPFLAGS)
test_udev_CPPFLAGS = \
$(udev_common_CPPFLAGS)
@@
-1354,7
+1374,8
@@
ata_id_SOURCES = \
src/udev/ata_id/ata_id.c
ata_id_LDADD = \
src/udev/ata_id/ata_id.c
ata_id_LDADD = \
- libudev-private.la
+ libudev-private.la \
+ libsystemd-basic.la
udevlibexec_PROGRAMS += \
ata_id
udevlibexec_PROGRAMS += \
ata_id
@@
-1364,7
+1385,8
@@
cdrom_id_SOURCES = \
src/udev/cdrom_id/cdrom_id.c
cdrom_id_LDADD = \
src/udev/cdrom_id/cdrom_id.c
cdrom_id_LDADD = \
- libudev-private.la
+ libudev-private.la \
+ libsystemd-basic.la
udevlibexec_PROGRAMS += \
cdrom_id
udevlibexec_PROGRAMS += \
cdrom_id
@@
-1390,7
+1412,8
@@
scsi_id_SOURCES =\
src/udev/scsi_id/scsi_id.h
scsi_id_LDADD = \
src/udev/scsi_id/scsi_id.h
scsi_id_LDADD = \
- libudev-private.la
+ libudev-private.la \
+ libsystemd-basic.la
udevlibexec_PROGRAMS += \
scsi_id
udevlibexec_PROGRAMS += \
scsi_id
@@
-1416,7
+1439,8
@@
accelerometer_SOURCES = \
src/udev/accelerometer/accelerometer.c
accelerometer_LDADD = \
src/udev/accelerometer/accelerometer.c
accelerometer_LDADD = \
- libudev-private.la -lm
+ libudev-private.la -lm \
+ libsystemd-basic.la
udevlibexec_PROGRAMS += \
accelerometer
udevlibexec_PROGRAMS += \
accelerometer
@@
-1610,20
+1634,16
@@
dist_udevrules_DATA += \
src/udev/keymap/95-keyboard-force-release.rules
dist_udevhome_SCRIPTS = \
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/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 \
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 = \
udevkeymapdir = $(libexecdir)/udev/keymaps
dist_udevkeymap_DATA = \