X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=1916770a01fb05783ee05266b2393b5b46015637;hb=cbcb846a4c9c9b8215a3f484d70e3cefde5ba226;hp=8d13f19382070f46ed847b8e8c319df42f13a7e4;hpb=c0b19a171794d92b68414a91c3bc804e22528142;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 8d13f1938..1916770a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ CLEANFILES =
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=8
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=3
 LIBUDEV_AGE=8
 
 SUBDIRS += libudev/docs
@@ -91,12 +91,11 @@ UNINSTALL_EXEC_HOOKS = libudev-uninstall-move-hook
 # ------------------------------------------------------------------------------
 install-data-local:
 	-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
+	-mkdir -p $(DESTDIR)$(libexecdir)/devices
 
 EXTRA_DIST += \
-	rules/packages \
-	rules/redhat \
-	rules/suse \
-	rules/gentoo
+	rules/arch \
+	rules/misc
 
 udevrulesdir = $(libexecdir)/rules.d
 dist_udevrules_DATA = \
@@ -156,7 +155,7 @@ EXTRA_DIST += \
 	udev/udevd.xml
 
 %.7 %.8 : %.xml
-	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+	$(AM_V_GEN)$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 # ------------------------------------------------------------------------------
 # udev tests
@@ -466,6 +465,21 @@ dist_udevrules_DATA += \
 
 libexec_PROGRAMS += extras/mobile-action-modeswitch/mobile-action-modeswitch
 
+# ------------------------------------------------------------------------------
+# mtd_probe - autoloads FTL module for mtd devices
+# ------------------------------------------------------------------------------
+extras_mtd_probe_mtd_probe_SOURCES =  \
+							extras/mtd_probe/mtd_probe.c \
+							extras/mtd_probe/mtd_probe.h \
+							extras/mtd_probe/probe_smartmedia.c
+
+extras_mtd_probe_mtd_probe_CPPFLAGS = $(AM_CPPFLAGS)
+
+dist_udevrules_DATA += extras/mtd_probe/75-probe_mtd.rules
+
+libexec_PROGRAMS += extras/mtd_probe/mtd_probe
+ 
+
 # ------------------------------------------------------------------------------
 # keymap - map custom hardware's multimedia keys
 # ------------------------------------------------------------------------------
@@ -545,7 +559,7 @@ dist_udevkeymapforcerel_DATA = \
 	extras/keymap/force-release-maps/common-volume-keys
 
 extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
-	mkdir -p extras/keymap
+	$(AM_V_at)mkdir -p extras/keymap
 	$(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
 extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt