X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=99a0133b3ac5ff90d08af47aee79d10c3ef08385;hp=b7ced1dc7f8775f2cbe87e1d5702539b2811afa7;hb=fc8d61c53d6c181dc1e9f5a23c0f805c32a392af;hpb=9a6741ba2f5ef72c051b11484daabd56213742c0

diff --git a/Makefile.am b/Makefile.am
index b7ced1dc7..99a0133b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,9 @@ CLEANFILES =
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
-LIBUDEV_CURRENT=6
-LIBUDEV_REVISION=1
-LIBUDEV_AGE=6
+LIBUDEV_CURRENT=7
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=7
 
 SUBDIRS += libudev/docs
 
@@ -143,12 +143,8 @@ udev_udevadm_SOURCES = \
 udev_udevadm_LDADD = libudev/libudev-private.la
 
 # ------------------------------------------------------------------------------
-# udev docs and man pages
+# udev man pages
 # ------------------------------------------------------------------------------
-writing_udev_rulesdir = $(docdir)/writing_udev_rules
-dist_writing_udev_rules_DATA = \
-	docs/writing_udev_rules/index.html
-
 dist_man_MANS = \
 	udev/udev.7 \
 	udev/udevadm.8 \
@@ -243,7 +239,7 @@ dist_udevrules_DATA += extras/floppy/60-floppy.rules
 # input_id - import input device class
 # ------------------------------------------------------------------------------
 extras_input_id_input_id_SOURCES = extras/input_id/input_id.c
-extras_input_id_input_id_LDADD = libudev/libudev.la
+extras_input_id_input_id_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/input_id/input_id
 
 # ------------------------------------------------------------------------------
@@ -522,6 +518,7 @@ dist_udevkeymap_DATA = \
 	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/maxdata-pro_7000 \
@@ -540,13 +537,16 @@ dist_udevkeymap_DATA = \
 	extras/keymap/keymaps/samsung-sx20s \
 	extras/keymap/keymaps/toshiba-satellite_a100 \
 	extras/keymap/keymaps/toshiba-satellite_a110 \
+	extras/keymap/keymaps/toshiba-satellite_m30x \
 	extras/keymap/keymaps/zepto-znote
 
 udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
-	extras/keymap/force-release-maps/samsung-other
+	extras/keymap/force-release-maps/samsung-other \
+	extras/keymap/force-release-maps/fujitsu-amilo-si1848 \
+	extras/keymap/force-release-maps/dell-studio-1557
 
-extras/keymap/keys.txt: /usr/include/linux/input.h
+extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
 	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/' > $@