remove remaining support for CONFIG_SYSFS_DEPRECATED

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3e9713fc91b20e2b0a2c1e8ac432e7baa7969bf2..993d70075db1c88554a294bb8da771315e83fc03 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ CLEANFILES =
 # libudev
 # ------------------------------------------------------------------------------
 LIBUDEV_CURRENT=5
-LIBUDEV_REVISION=1
+LIBUDEV_REVISION=2
 LIBUDEV_AGE=5
 
 SUBDIRS += libudev/docs
@@ -235,6 +235,7 @@ dist_udevrules_DATA += extras/edd_id/61-persistent-storage-edd.rules
 extras_floppy_create_floppy_devices_SOURCES = extras/floppy/create_floppy_devices.c
 extras_floppy_create_floppy_devices_LDADD = libudev/libudev-private.la
 libexec_PROGRAMS += extras/floppy/create_floppy_devices
+dist_udevrules_DATA += extras/floppy/60-floppy.rules
 
 # ------------------------------------------------------------------------------
 # input_id - import input device class
@@ -480,8 +481,10 @@ BUILT_SOURCES += $(nodist_extras_keymap_keymap_SOURCES)
 
 EXTRA_DIST += extras/keymap/check-keymaps.sh
 dist_udevrules_DATA += extras/keymap/95-keymap.rules
+dist_udevrules_DATA += extras/keymap/95-keyboard-force-release.rules
 libexec_PROGRAMS += extras/keymap/keymap
 dist_libexec_SCRIPTS += extras/keymap/findkeyboards
+dist_libexec_SCRIPTS += extras/keymap/keyboard-force-release.sh
 dist_doc_DATA = extras/keymap/README.keymap.txt
 
 CLEANFILES += \
@@ -535,6 +538,10 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/toshiba-satellite_a110 \
        extras/keymap/keymaps/zepto-znote
 
+udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
+dist_udevkeymapforcerel_DATA = \
+       extras/keymap/keymaps/force-release/samsung-other
+
 extras/keymap/keys.txt: /usr/include/linux/input.h
        $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@