From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alan Jenkins Date: Thu, 29 Oct 2009 14:27:20 +0000 Subject: [PATCH] extras/keymap: fix build (GEN keys.txt) Message-Id: <4AE9A648.2090006@tuffmail.co.uk> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: linux-hotplug@vger.kernel.org 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 CC: Diego Elio 'Flameeyes' Petten=F2 --- 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 =3D \ extras/keymap/keymaps/toshiba-satellite_a110 \ extras/keymap/keymaps/zepto-znote =20 -extras/keymap/keys.txt: /usr/include/linux/input.h - $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[[:space:]]+[0-9]/ { if ($$2 !=3D = "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 !=3D "KEY_MAX" && $$2 !=3D = "KEY_CNT") { print $$2 } }' < $< > $@ =20 -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 }' = < $< > $@ =20 extras/keymap/keys-from-name.h: extras/keymap/keys-from-name.gperf Makefile --=20 1.5.6.5