Re: [PATCH] extras/keymap: fix build (GEN keys.txt)

[Martin Pitt <martin.pitt@ubuntu.com>]

Hello Alan,

Alan Jenkins [2009-10-29 14:27 +0000]:
> 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".

Hm, I'm autoreconfing and/or rebuilding the udev tree all the time,
without problems. We also have this in our packages in Ubuntu, and it
produces valid and working files.
Can you please give some precise steps how it fails?

> -     $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[[:space:]]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
> +	$(AM_V_GEN)$(AWK) '/^#define.*KEY_/ { if ($$2 != "KEY_MAX" && $$2 != "KEY_CNT") { print $$2 } }' < $< > $@

As Lennart already pointed out, the COFFEE->SCREENLOCK sed is
important to not break existing keymaps (commit 7f06ec2e19). Also,
your change drops the check that it's a real key definition instead of
an alias definition, and thus generates duplicate hash values. That
wasn't changed in the move to single top-level Makefile.am, but was an
explicit bug fix (commit 6983c0d0f).

> -extras/keymap/keys.txt: /usr/include/linux/input.h
> +extras/keymap/keys.txt: /usr/include/linux/input.h Makefile

> -extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt
> +extras/keymap/keys-from-name.gperf: extras/keymap/keys.txt Makefile

Why is that necessary? You shouldn't change the Makefile manually, it
should at most depend on Makefile.am changes (but even that is not
necessary since it just calls gperf, which doesn't care about any
other file in the tree).

Thanks,

Martin

-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)