summaryrefslogtreecommitdiff
path: root/keymaps
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2012-11-20 14:44:47 -0500
committerAnthony G. Basile <blueness@gentoo.org>2012-11-20 14:44:47 -0500
commitbcc69ef934c9d14732e16551032242fa599b44e7 (patch)
treeacc183e5e4ba09ab8893a432514b9fc5a1d78736 /keymaps
parent802d021d2e403862f4692ee67956e7e0160c1879 (diff)
Reintroduce keymaps build and test
This commit reintroduces code to 1) build src/keymap 2) test keymap/Makefile.am that it has all the key maps listed 3) test that all the key names in keymap/* are in <linux/input.h> 4) do a syntax check on rules/*.rules which now includes 95-keymap.rules and 95-keyboard-force-release.rules For #4, the regex expressions in rule-syntax-check.py had to be updated. They do not allow trailing comments via # comment, and I did not include that. A rule in 95-keymap.rules had to have its comment moved from the end to another line. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'keymaps')
-rw-r--r--keymaps/Makefile.README3
-rw-r--r--keymaps/Makefile.am4
2 files changed, 3 insertions, 4 deletions
diff --git a/keymaps/Makefile.README b/keymaps/Makefile.README
new file mode 100644
index 0000000000..18bd334695
--- /dev/null
+++ b/keymaps/Makefile.README
@@ -0,0 +1,3 @@
+Because of the parsing done by src/keymap/check-keymaps.sh,
+you should not put anything in this directory except for
+keymap files and files begining with Makefile.
diff --git a/keymaps/Makefile.am b/keymaps/Makefile.am
index f2dbb42023..f3f1d9adc1 100644
--- a/keymaps/Makefile.am
+++ b/keymaps/Makefile.am
@@ -4,7 +4,6 @@ rootprefix=@rootprefix@
udevlibexecdir=$(rootprefix)/lib/udev
udevkeymapdir = $(udevlibexecdir)/keymaps
-if ENABLE_KEYMAP
dist_udevkeymap_DATA = \
acer \
acer-aspire_5720 \
@@ -66,6 +65,3 @@ dist_udevkeymap_DATA = \
toshiba-satellite_a110 \
toshiba-satellite_m30x \
zepto-znote
-
-endif
-