summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-04-09 16:37:54 +0200
committerKay Sievers <kay@vrfy.org>2012-04-09 19:25:41 +0200
commit83cd6b754b270091840456a2c8a66dae19f5a7dc (patch)
treec7088359f9927196a9e64b5b1bfb100733725f47 /Makefile.am
parentf1ff47be175bdcb8ed8512393fee9f9615501e24 (diff)
udev: convert 'uaccess' to a builtin
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am45
1 files changed, 18 insertions, 27 deletions
diff --git a/Makefile.am b/Makefile.am
index d4b706eb3b..95119e30db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1271,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) \
@@ -1287,11 +1289,23 @@ 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)
@@ -2597,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