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

diff --git a/Makefile.am b/Makefile.am
index 1b4e2eaca..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
 
@@ -239,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
 
 # ------------------------------------------------------------------------------
@@ -537,11 +537,13 @@ 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/fujitsu-amilo-si1848 \
 	extras/keymap/force-release-maps/dell-studio-1557
 
 extras/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h