chiark / gitweb /
rules: do not preprocess 80-drivers.rules + 75-probe_mtd.rules
authorKay Sievers <kay.sievers@vrfy.org>
Fri, 23 Dec 2011 03:54:08 +0000 (04:54 +0100)
committerKay Sievers <kay.sievers@vrfy.org>
Fri, 23 Dec 2011 03:54:08 +0000 (04:54 +0100)
Makefile.am
extras/mtd_probe/.gitignore
extras/mtd_probe/75-probe_mtd.rules [moved from extras/mtd_probe/75-probe_mtd.rules.in with 100% similarity]
rules/.gitignore [deleted file]
rules/rules.d/80-drivers.rules [moved from rules/rules.d/80-drivers.rules.in with 100% similarity]

index 0064631..3e7996f 100644 (file)
@@ -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
index 70d3e83..82b8ab5 100644 (file)
@@ -1,2 +1 @@
 mtd_probe
-75-probe_mtd.rules
diff --git a/rules/.gitignore b/rules/.gitignore
deleted file mode 100644 (file)
index 16f9c2d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-rules.d/80-drivers.rules