chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rules: do not preprocess 80-drivers.rules + 75-probe_mtd.rules
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 178685ea22108c23ab3ecd37ed9424c3ece5958f..3e7996fdd90fdef9b68971d2d9c91e3021ed4872 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-144,19
+144,9
@@
dist_udevrules_DATA = \
rules/rules.d/60-persistent-serial.rules \
rules/rules.d/60-persistent-input.rules \
rules/rules.d/60-persistent-alsa.rules \
rules/rules.d/60-persistent-serial.rules \
rules/rules.d/60-persistent-input.rules \
rules/rules.d/60-persistent-alsa.rules \
- rules/rules.d/95-udev-late.rules
-
-udevrules_DATA = \
rules/rules.d/60-persistent-storage.rules \
rules/rules.d/60-persistent-storage.rules \
- rules/rules.d/80-drivers.rules
-
-EXTRA_DIST += \
- rules/rules.d/80-drivers.rules.in \
- rules/rules.d/60-persistent-storage.rules.in
-
-CLEANFILES += \
rules/rules.d/80-drivers.rules \
rules/rules.d/80-drivers.rules \
- rules/rules.d/
60-persistent-storag
e.rules
+ rules/rules.d/
95-udev-lat
e.rules
udevconfdir = $(sysconfdir)/udev
dist_udevconf_DATA = udev.conf
udevconfdir = $(sysconfdir)/udev
dist_udevconf_DATA = udev.conf
@@
-203,7
+193,7
@@
bin_PROGRAMS = \
libexec_PROGRAMS = \
udev/udevd
libexec_PROGRAMS = \
udev/udevd
-udev_common_sources =\
+udev_common_sources =
\
udev/udev.h \
udev/udev-event.c \
udev/udev-watch.c \
udev/udev.h \
udev/udev-event.c \
udev/udev-watch.c \
@@
-213,14
+203,24
@@
udev_common_sources =\
udev/udev-builtin.c \
udev/udev-builtin-path_id.c \
udev/udev-builtin-usb_id.c \
udev/udev-builtin.c \
udev/udev-builtin-path_id.c \
udev/udev-builtin-usb_id.c \
- udev/udev-builtin-input_id.c
+ udev/udev-builtin-input_id.c \
+ udev/udev-builtin-blkid.c \
+ udev/udev-builtin-kmod.c
+
+udev_common_CFLAGS = \
+ $(BLKID_CFLAGS)
+
+udev_common_LDADD = \
+ libudev/libudev-private.la \
+ $(BLKID_LIBS)
udev_udevd_SOURCES = \
$(udev_common_sources) \
udev/udevd.c \
udev/sd-daemon.h \
udev/sd-daemon.c
udev_udevd_SOURCES = \
$(udev_common_sources) \
udev/udevd.c \
udev/sd-daemon.h \
udev/sd-daemon.c
-udev_udevd_LDADD = libudev/libudev-private.la
+udev_udevd_CFLAGS = $(udev_common_CFLAGS)
+udev_udevd_LDADD = $(udev_common_LDADD)
udev_udevadm_SOURCES = \
$(udev_common_sources) \
udev_udevadm_SOURCES = \
$(udev_common_sources) \
@@
-232,7
+232,8
@@
udev_udevadm_SOURCES = \
udev/udevadm-trigger.c \
udev/udevadm-test.c \
udev/udevadm-test-builtin.c
udev/udevadm-trigger.c \
udev/udevadm-test.c \
udev/udevadm-test-builtin.c
-udev_udevadm_LDADD = libudev/libudev-private.la
+udev_udevadm_CFLAGS = $(udev_common_CFLAGS)
+udev_udevadm_LDADD = $(udev_common_LDADD)
# ------------------------------------------------------------------------------
# udev man pages
# ------------------------------------------------------------------------------
# udev man pages
@@
-273,7
+274,8
@@
libudev_test_libudev_LDADD = libudev/libudev.la
udev_test_udev_SOURCES = \
$(udev_common_sources) \
udev/test-udev.c
udev_test_udev_SOURCES = \
$(udev_common_sources) \
udev/test-udev.c
-udev_test_udev_LDADD = libudev/libudev-private.la
+udev_test_udev_CFLAGS = $(udev_common_CFLAGS)
+udev_test_udev_LDADD = $(udev_common_LDADD)
# ------------------------------------------------------------------------------
# firmware - firmware loading
# ------------------------------------------------------------------------------
# firmware - firmware loading
@@
-630,10
+632,8
@@
extras_mtd_probe_mtd_probe_SOURCES = \
extras/mtd_probe/mtd_probe.h \
extras/mtd_probe/probe_smartmedia.c
extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
extras/mtd_probe/mtd_probe.h \
extras/mtd_probe/probe_smartmedia.c
extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
-udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules
+
dist_
udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules
libexec_PROGRAMS += extras/mtd_probe/mtd_probe
libexec_PROGRAMS += extras/mtd_probe/mtd_probe
-EXTRA_DIST += extras/mtd_probe/75-probe_mtd.rules.in
-CLEANFILES += extras/mtd_probe/75-probe_mtd.rules
endif
if ENABLE_RULE_GENERATOR
endif
if ENABLE_RULE_GENERATOR