summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-12-23 04:54:08 +0100
committerKay Sievers <kay.sievers@vrfy.org>2011-12-23 04:54:08 +0100
commit4a9460f15a8ff198d6a9c249bdd63572509e23bb (patch)
tree8c08f13da6b492484fe85ce41df09d63252f715c
parent06316d9f1a91b4d3efdb7402e72498cb3deb1806 (diff)
rules: do not preprocess 80-drivers.rules + 75-probe_mtd.rules
-rw-r--r--Makefile.am14
-rw-r--r--extras/mtd_probe/.gitignore1
-rw-r--r--extras/mtd_probe/75-probe_mtd.rules (renamed from extras/mtd_probe/75-probe_mtd.rules.in)0
-rw-r--r--rules/.gitignore1
-rw-r--r--rules/rules.d/80-drivers.rules (renamed from rules/rules.d/80-drivers.rules.in)0
5 files changed, 2 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am
index 0064631e44..3e7996fdd9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -145,17 +145,9 @@ dist_udevrules_DATA = \
rules/rules.d/60-persistent-input.rules \
rules/rules.d/60-persistent-alsa.rules \
rules/rules.d/60-persistent-storage.rules \
+ rules/rules.d/80-drivers.rules \
rules/rules.d/95-udev-late.rules
-udevrules_DATA = \
- rules/rules.d/80-drivers.rules
-
-EXTRA_DIST += \
- rules/rules.d/80-drivers.rules.in
-
-CLEANFILES += \
- rules/rules.d/80-drivers.rules
-
udevconfdir = $(sysconfdir)/udev
dist_udevconf_DATA = udev.conf
@@ -640,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)
-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
-EXTRA_DIST += extras/mtd_probe/75-probe_mtd.rules.in
-CLEANFILES += extras/mtd_probe/75-probe_mtd.rules
endif
if ENABLE_RULE_GENERATOR
diff --git a/extras/mtd_probe/.gitignore b/extras/mtd_probe/.gitignore
index 70d3e8310e..82b8ab501f 100644
--- a/extras/mtd_probe/.gitignore
+++ b/extras/mtd_probe/.gitignore
@@ -1,2 +1 @@
mtd_probe
-75-probe_mtd.rules
diff --git a/extras/mtd_probe/75-probe_mtd.rules.in b/extras/mtd_probe/75-probe_mtd.rules
index 6b0c1c27e6..6b0c1c27e6 100644
--- a/extras/mtd_probe/75-probe_mtd.rules.in
+++ b/extras/mtd_probe/75-probe_mtd.rules
diff --git a/rules/.gitignore b/rules/.gitignore
deleted file mode 100644
index 16f9c2daa8..0000000000
--- a/rules/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-rules.d/80-drivers.rules
diff --git a/rules/rules.d/80-drivers.rules.in b/rules/rules.d/80-drivers.rules
index 38ebfeb0e6..38ebfeb0e6 100644
--- a/rules/rules.d/80-drivers.rules.in
+++ b/rules/rules.d/80-drivers.rules