Pass linux/input.h as argument to make-event-names.py

Rather than a hardcoded path inside the source.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/libevdev/Makefile.am b/libevdev/Makefile.am
index e87c72c3d83ece35f22c4659afb84e3616aa3028..3833d61939d1c120e1fbc7ea06c1664e885741ec 100644 (file)
--- 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 > $@
+       $(PYTHON) $(srcdir)/make-event-names.py --output=c $(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 e321bd7bd5438064f0fef8bc3f59b21ae1039167..b1db9bc6613dd92a8ed6c4791961d269da3cfcd8 100755 (executable)
--- a/libevdev/make-event-names.py
+++ b/libevdev/make-event-names.py
@@ -9,8 +9,6 @@ import re
 import sys
 import argparse
 
-SOURCE_FILE = "/usr/include/linux/input.h"
-
 class Bits(object):
        pass
 
@@ -166,9 +164,7 @@ def parse_define(bits, line):
                b = getattr(bits, attrname)
                b[value] = name
 
-def parse(path):
-       fp = open(path)
-
+def parse(fp):
        bits = Bits()
 
        lines = fp.readlines()
@@ -180,11 +176,14 @@ def parse(path):
        return bits
 
 if __name__ == "__main__":
-       bits = parse(SOURCE_FILE)
        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)
        else: