chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
invalidate rules and kmod index with 'udevadm control --reload'
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index eb9ee9313503b36f622724622082459d5a603410..8c4ea4b0fb204647ec997873dd2c667c156237c8 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-16,6
+16,7
@@
AM_CPPFLAGS = \
-DLIBEXECDIR=\""$(libexecdir)"\"
AM_CFLAGS = \
-DLIBEXECDIR=\""$(libexecdir)"\"
AM_CFLAGS = \
+ ${my_CFLAGS} \
-fvisibility=hidden \
-ffunction-sections \
-fdata-sections
-fvisibility=hidden \
-ffunction-sections \
-fdata-sections
@@
-46,7
+47,6
@@
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
-e 's,@libdir\@,$(libdir),g' \
-e 's,@includedir\@,$(includedir),g' \
-e 's,@bindir\@,$(bindir),g' \
-e 's,@libdir\@,$(libdir),g' \
-e 's,@includedir\@,$(includedir),g' \
-e 's,@bindir\@,$(bindir),g' \
- -e 's,@sbindir\@,$(sbindir),g' \
-e 's,@libexecdir\@,$(libexecdir),g' \
< $< > $@ || rm $@
-e 's,@libexecdir\@,$(libexecdir),g' \
< $< > $@ || rm $@
@@
-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
@@
-218,11
+208,13
@@
udev_common_sources = \
udev/udev-builtin-kmod.c
udev_common_CFLAGS = \
udev/udev-builtin-kmod.c
udev_common_CFLAGS = \
- $(BLKID_CFLAGS)
+ $(BLKID_CFLAGS) \
+ $(KMOD_CFLAGS)
udev_common_LDADD = \
libudev/libudev-private.la \
udev_common_LDADD = \
libudev/libudev-private.la \
- $(BLKID_LIBS)
+ $(BLKID_LIBS) \
+ $(KMOD_LIBS)
udev_udevd_SOURCES = \
$(udev_common_sources) \
udev_udevd_SOURCES = \
$(udev_common_sources) \
@@
-642,10
+634,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