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: make firmware loading optional and disable by default
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 7e9cdfdb261a9dd6515c67d6a6ddb26b8d3da80e..37eeb01d583e1f6141c1f7abbe691ac7ac8427f3 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-1352,12
+1352,10
@@
rootlibexec_PROGRAMS += \
nodist_systemunit_DATA += \
units/systemd-modules-load.service
nodist_systemunit_DATA += \
units/systemd-modules-load.service
+
SYSINIT_TARGET_WANTS += \
systemd-modules-load.service
SYSINIT_TARGET_WANTS += \
systemd-modules-load.service
-dist_udevrules_DATA += \
- rules/80-drivers.rules
-
endif
EXTRA_DIST += \
endif
EXTRA_DIST += \
@@
-1809,7
+1807,6
@@
libudev_core_la_SOURCES = \
src/udev/udev-ctrl.c \
src/udev/udev-builtin.c \
src/udev/udev-builtin-btrfs.c \
src/udev/udev-ctrl.c \
src/udev/udev-builtin.c \
src/udev/udev-builtin-btrfs.c \
- src/udev/udev-builtin-firmware.c \
src/udev/udev-builtin-hwdb.c \
src/udev/udev-builtin-input_id.c \
src/udev/udev-builtin-net_id.c \
src/udev/udev-builtin-hwdb.c \
src/udev/udev-builtin-input_id.c \
src/udev/udev-builtin-net_id.c \
@@
-1833,9
+1830,20
@@
libudev_core_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DFIRMWARE_PATH="$(FIRMWARE_PATH)"
$(AM_CPPFLAGS) \
-DFIRMWARE_PATH="$(FIRMWARE_PATH)"
+if ENABLE_FIRMWARE
+libudev_core_la_SOURCES += \
+ src/udev/udev-builtin-firmware.c
+
+dist_udevrules_DATA += \
+ rules/50-firmware.rules
+endif
+
if HAVE_KMOD
libudev_core_la_SOURCES += \
src/udev/udev-builtin-kmod.c
if HAVE_KMOD
libudev_core_la_SOURCES += \
src/udev/udev-builtin-kmod.c
+
+dist_udevrules_DATA += \
+ rules/80-drivers.rules
endif
if HAVE_BLKID
endif
if HAVE_BLKID