summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@ubuntu.com>2015-10-14 06:52:41 +0200
committerMartin Pitt <martin.pitt@ubuntu.com>2015-10-14 07:15:58 +0200
commit1d3f8fa747b71db60872bc21df5b6489b73b740d (patch)
tree92ac7e54ce13be95cf142ba3a6d6dd9aee65ccd0
parentc6853957f535263882e953764d5fc3ae43f979fd (diff)
keymap: Drop keyboard-keys-to-name.h
We don't use that anywhere any more. With the introduction of alias names it also is not a proper mapping any more as several keys (e. g. KEY_COFFEE and KEY_SCREENLOCK) have the same numerical mapping.
-rw-r--r--Makefile.am6
-rw-r--r--src/udev/.gitignore1
2 files changed, 1 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am
index e3e07b8c7d..336ba0afce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1229,7 +1229,7 @@ BUILT_SOURCES += \
$(gperf_gperf_m4_sources:-gperf.gperf.m4=-gperf-nulstr.c) \
$(gperf_gperf_sources:-gperf.gperf=-gperf.c) \
$(gperf_txt_sources:-list.txt=-from-name.h) \
- $(gperf_txt_sources:-list.txt=-to-name.h)
+ $(filter-out %keyboard-keys-to-name.h,$(gperf_txt_sources:-list.txt=-to-name.h))
CLEANFILES += \
$(gperf_txt_sources:-list.txt=-from-name.gperf)
@@ -3491,9 +3491,6 @@ src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt
src/udev/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf
$(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@
-src/udev/keyboard-keys-to-name.h: src/udev/keyboard-keys-list.txt
- $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
-
gperf_txt_sources += \
src/udev/keyboard-keys-list.txt
@@ -3520,7 +3517,6 @@ libudev_core_la_SOURCES = \
nodist_libudev_core_la_SOURCES = \
src/udev/keyboard-keys-from-name.h \
- src/udev/keyboard-keys-to-name.h \
src/udev/net/link-config-gperf.c
gperf_gperf_sources += \
diff --git a/src/udev/.gitignore b/src/udev/.gitignore
index ba112ce218..f5d8be3dc1 100644
--- a/src/udev/.gitignore
+++ b/src/udev/.gitignore
@@ -1,5 +1,4 @@
/udev.pc
/keyboard-keys-from-name.gperf
/keyboard-keys-from-name.h
-/keyboard-keys-to-name.h
/keyboard-keys-list.txt