X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=33ab56a6247fe93301e6f29fce6d6946a8b86396;hb=86a62b0cf285b3eb9d953c6224cce30d811bc1b0;hp=f491900077f510c2a49e3f127d5b9f991dd20ab4;hpb=860a404ddc89ad4bab04955b484954f6bb56448f;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index f49190007..33ab56a62 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,8 @@ AM_LDFLAGS = \
 	-Wl,--as-needed
 
 DISTCHECK_CONFIGURE_FLAGS = \
-	--enable-gtk-doc
+	--enable-gtk-doc \
+	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
 CLEANFILES =
 
@@ -29,7 +30,7 @@ CLEANFILES =
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=8
-LIBUDEV_REVISION=2
+LIBUDEV_REVISION=3
 LIBUDEV_AGE=8
 
 SUBDIRS += libudev/docs
@@ -94,9 +95,8 @@ install-data-local:
 	-mkdir -p $(DESTDIR)$(libexecdir)/devices
 
 EXTRA_DIST += \
-	rules/packages \
-	rules/suse \
-	rules/gentoo
+	rules/arch \
+	rules/misc
 
 udevrulesdir = $(libexecdir)/rules.d
 dist_udevrules_DATA = \
@@ -115,6 +115,13 @@ dist_udevconf_DATA = udev.conf
 sharepkgconfigdir = $(datadir)/pkgconfig
 sharepkgconfig_DATA = udev/udev.pc
 
+if WITH_SYSTEMD
+systemdsystemunit_DATA = \
+	init/udev.service \
+	init/udev-settle.service \
+	init/udev-retry.service
+endif
+
 sbin_PROGRAMS = \
 	udev/udevd \
 	udev/udevadm
@@ -374,7 +381,7 @@ extras/gudev/gudevenumtypes.c: extras/gudev/gudevenumtypes.c.template extras/gud
 if ENABLE_INTROSPECTION
 extras/gudev/GUdev-1.0.gir: extras/gudev/libgudev-1.0.la $(G_IR_SCANNER) Makefile.am
 	$(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
-	LD_LIBRARY_PATH=$(top_builddir)/extras/gudev \
+	LD_LIBRARY_PATH=$(top_builddir)/extras/gudev:$$LD_LIBRARY_PATH \
 	$(G_IR_SCANNER) -v \
 		--namespace GUdev \
 		--nsversion=1.0 \
@@ -466,6 +473,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
 # ------------------------------------------------------------------------------