keymap: Add Toshiba Satellite M30X

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 126064b631a487bcb7dcf244d9bddc8f388e2f99..db23f16e24b55e408c80ea7951b021fd833c2a2b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,9 +28,9 @@ CLEANFILES =
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------
 # ------------------------------------------------------------------------------
 # libudev
 # ------------------------------------------------------------------------------

-LIBUDEV_CURRENT=5
-LIBUDEV_REVISION=2
-LIBUDEV_AGE=5
+LIBUDEV_CURRENT=6
+LIBUDEV_REVISION=1
+LIBUDEV_AGE=6

 
 SUBDIRS += libudev/docs
 
 
 SUBDIRS += libudev/docs
 


@@ -143,12 +143,8 @@ udev_udevadm_SOURCES = \
 udev_udevadm_LDADD = libudev/libudev-private.la
 
 # ------------------------------------------------------------------------------
 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 \
 dist_man_MANS = \
        udev/udev.7 \
        udev/udevadm.8 \


@@ -519,8 +515,10 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/hewlett-packard-tx2 \
        extras/keymap/keymaps/inventec-symphony_6.0_7.0 \
        extras/keymap/keymaps/lenovo-3000 \
        extras/keymap/keymaps/hewlett-packard-tx2 \
        extras/keymap/keymaps/inventec-symphony_6.0_7.0 \
        extras/keymap/keymaps/lenovo-3000 \

+       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/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 \
        extras/keymap/keymaps/logitech-wave \
        extras/keymap/keymaps/logitech-wave-cordless \
        extras/keymap/keymaps/maxdata-pro_7000 \


@@ -532,19 +530,23 @@ dist_udevkeymap_DATA = \
        extras/keymap/keymaps/module-lenovo \
        extras/keymap/keymaps/module-sony \
        extras/keymap/keymaps/module-sony-old \
        extras/keymap/keymaps/module-lenovo \
        extras/keymap/keymaps/module-sony \
        extras/keymap/keymaps/module-sony-old \

+       extras/keymap/keymaps/olpc-xo \

        extras/keymap/keymaps/oqo-model2 \
        extras/keymap/keymaps/samsung-other \
        extras/keymap/keymaps/samsung-sq1us \
        extras/keymap/keymaps/samsung-sx20s \
        extras/keymap/keymaps/toshiba-satellite_a100 \
        extras/keymap/keymaps/toshiba-satellite_a110 \
        extras/keymap/keymaps/oqo-model2 \
        extras/keymap/keymaps/samsung-other \
        extras/keymap/keymaps/samsung-sq1us \
        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/keymaps/zepto-znote
 
 udevkeymapforcereldir = $(libexecdir)/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \

-       extras/keymap/keymaps/force-release/samsung-other
+       extras/keymap/force-release-maps/samsung-other \
+       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/' > $@
 
 extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt
        $(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