SUBDIRS = . po
LIBUDEV_CURRENT=13
-LIBUDEV_REVISION=2
+LIBUDEV_REVISION=3
LIBUDEV_AGE=13
LIBGUDEV_CURRENT=1
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) \
-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)
$(udev_common_CFLAGS)
udevadm_LDADD = \
- $(udev_common_LDADD)
+ $(udev_common_LDADD) \
+ libsystemd-basic.la
udevadm_CPPFLAGS = \
$(udev_common_CPPFLAGS)
$(udev_common_CFLAGS)
test_udev_LDADD = \
- $(udev_common_LDADD)
+ $(udev_common_LDADD) \
+ libsystemd-basic.la
test_udev_CPPFLAGS = \
$(udev_common_CPPFLAGS)
src/udev/ata_id/ata_id.c
ata_id_LDADD = \
- libudev-private.la
+ libudev-private.la \
+ libsystemd-basic.la
udevlibexec_PROGRAMS += \
ata_id
src/udev/cdrom_id/cdrom_id.c
cdrom_id_LDADD = \
- libudev-private.la
+ libudev-private.la \
+ libsystemd-basic.la
udevlibexec_PROGRAMS += \
cdrom_id
src/udev/scsi_id/scsi_id.h
scsi_id_LDADD = \
- libudev-private.la
+ libudev-private.la \
+ libsystemd-basic.la
udevlibexec_PROGRAMS += \
scsi_id
src/udev/accelerometer/accelerometer.c
accelerometer_LDADD = \
- libudev-private.la -lm
+ libudev-private.la -lm \
+ libsystemd-basic.la
udevlibexec_PROGRAMS += \
accelerometer
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 = \
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