udev(7) manpage: Fix description of $attr

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8406a6bc316028b30fc31425bbe4e04675b92872..512de34a3166a30f139536aad10bedd681b87dda 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,16 +21,17 @@ AM_LDFLAGS = \
        -Wl,--as-needed
 
 DISTCHECK_CONFIGURE_FLAGS = \
-       --enable-gtk-doc
+       --enable-gtk-doc \
+       --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
 CLEANFILES =
 
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=8
+LIBUDEV_CURRENT=9
 LIBUDEV_REVISION=1
-LIBUDEV_AGE=8
+LIBUDEV_AGE=9
 
 SUBDIRS += libudev/docs
 
@@ -91,12 +92,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 = \
@@ -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
 # ------------------------------------------------------------------------------
@@ -512,14 +534,17 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/hewlett-packard-presario-2100 \
        extras/keymap/keymaps/hewlett-packard-tablet \
        extras/keymap/keymaps/hewlett-packard-tx2 \
+       extras/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
        extras/keymap/keymaps/inventec-symphony_6.0_7.0 \
        extras/keymap/keymaps/lenovo-3000 \
+       extras/keymap/keymaps/lenovo-ideapad \
        extras/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
        extras/keymap/keymaps/lenovo-thinkpad_x6_tablet \
        extras/keymap/keymaps/lenovo-thinkpad_x200_tablet \
        extras/keymap/keymaps/lg-x110 \
        extras/keymap/keymaps/logitech-wave \
        extras/keymap/keymaps/logitech-wave-cordless \
+       extras/keymap/keymaps/logitech-wave-pro-cordless \
        extras/keymap/keymaps/maxdata-pro_7000 \
        extras/keymap/keymaps/medion-fid2060 \
        extras/keymap/keymaps/medionnb-a555 \
@@ -530,6 +555,7 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/module-sony \
        extras/keymap/keymaps/module-sony-old \
        extras/keymap/keymaps/olpc-xo \
+       extras/keymap/keymaps/onkyo \
        extras/keymap/keymaps/oqo-model2 \
        extras/keymap/keymaps/samsung-other \
        extras/keymap/keymaps/samsung-sq1us \
@@ -545,7 +571,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