Commit 7d701b0 "Merge keymap building in the top-level Makefile.am"
caused a build failure when extras are enabled.
Specifically, it changed the command used to generate keys.txt in several
ways. The most obvious change was that the output was completely empty :).
This was probably missed due to stale Makefiles. Hint: to reproduce the
build failure, first run "make distclean".
Fix the generation of keys.txt by reverting to the original command.
Also add some dependencies on the Makefile. This means keys.txt will be
rebuilt automatically if the command is changed in future.
Build tested only. I don't use udev-keymap, so it would a good idea for
someone who does to test it (Diego?) :).
Signed-off-by: Alan Jenkins <alan-jenkins@xxxxxxxxxxxxxx>
CC: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx>
---
Makefile.am | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index cf7d364..a439157 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -530,10 +530,10 @@ dist_udevkeymap_DATA = \
extras/keymap/keymaps/toshiba-satellite_a110 \
extras/keymap/keymaps/zepto-znote
-extras/keymap/keys.txt: /usr/include/linux/input.h
- $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[[:space:]]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+extras/keymap/keys.txt: /usr/include/linux/input.h Makefile
+ $(AM_V_GEN)$(AWK) '/^#define.*KEY_/ { if ($$2 != "KEY_MAX" && $$2 != "KEY_CNT") { print $$2 } }' < $< > $@
-extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt
+extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt Makefile
$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
extras/keymap/keys-from-name.h: extras/keymap/keys-from-name.gperf Makefile
--
1.5.6.5
--
To unsubscribe from this list: send the line "unsubscribe linux-hotplug" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
