[PATCH libevdev 1/2] Drop --output flag from make-event-names.py

[Peter Hutterer]

On Tue, Jan 14, 2014 at 02:47:46PM -0500, Benjamin Tissoires wrote:
> On Mon, Jan 13, 2014 at 11:21 PM, Peter Hutterer
> <peter.hutterer at who-t.net> wrote:
> > This is a leftover from when the file was in evemu and used to generate python
> > headers too.
> >
> > Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> > ---
> >  libevdev/Makefile.am         | 2 +-
> >  libevdev/make-event-names.py | 6 +-----
> >  2 files changed, 2 insertions(+), 6 deletions(-)
> >
> > diff --git a/libevdev/Makefile.am b/libevdev/Makefile.am
> > index 739ed7d..96974fc 100644
> > --- a/libevdev/Makefile.am
> > +++ b/libevdev/Makefile.am
> > @@ -22,7 +22,7 @@ libevdevincludedir = $(includedir)/libevdev-1.0/libevdev
> >  libevdevinclude_HEADERS = libevdev.h libevdev-uinput.h
> >
> >  event-names.h: Makefile make-event-names.py
> > -       $(PYTHON) $(srcdir)/make-event-names.py --output=c $(top_srcdir)/include/linux/input.h  > $@
> > +       $(PYTHON) $(srcdir)/make-event-names.py $(top_srcdir)/include/linux/input.h  > $@
> >
> >  EXTRA_DIST = make-event-names.py
> >  CLEANFILES = event-names.h
> > diff --git a/libevdev/make-event-names.py b/libevdev/make-event-names.py
> > index 0dea9d6..986aaf4 100755
> > --- a/libevdev/make-event-names.py
> > +++ b/libevdev/make-event-names.py
> > @@ -228,14 +228,10 @@ def parse(fp):
> >
> >  if __name__ == "__main__":
> >         parser = argparse.ArgumentParser()
> > -       parser.add_argument("--output", default="c")
> >         parser.add_argument('source', metavar="/path/to/linux/input.h",
> >                             type=argparse.FileType('r'),
> >                             help='source file to parse')
> >
> >         args = parser.parse_args(sys.argv[1:])
> >         bits = parse(args.source)
> > -       if args.output == "python":
> > -               print_python_mapping_table(bits)
> 
> I think we should also get rid of the function
> print_python_mapping_table() (maybe in a separate patch?).

good catch. I just squashed it in, thanks.

Cheers,
   Peter

> 
> Other than that:
> Reviewed-by: Benjamin Tissoires <benjamin.tissoires at gmail.com>
> 
> Cheers,
> Benjamin
> 
> > -       else:
> > -               print_mapping_table(bits)
> > +       print_mapping_table(bits)
> > --
> > 1.8.4.2
> >
> > _______________________________________________
> > Input-tools mailing list
> > Input-tools at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/input-tools