make-event-names.py should take the files as argument

Don't rely on cat, just let our script read everything as required.

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

diff --git a/configure.ac b/configure.ac
index 67849899d085b4469a775753f35c0c20a3fbb318..b284acbff03a8f646b95e63bd88ed2dd726722c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -127,7 +127,6 @@ AC_SUBST([GCOV_LDFLAGS])
 AC_MSG_RESULT([$enable_gcov])
 
 AM_PATH_PYTHON([2.6])
-AC_PATH_PROG(CAT, [cat])
 
 # nm to check for leaking symbols in the static library
 AC_PATH_PROG(NM, [nm])

diff --git a/libevdev/Makefile.am b/libevdev/Makefile.am
index fcb434d739856b998fef3f68bca01e980ac16a4c..f2757de578c0fa6e205a95924a1f1cb2da8e7030 100644 (file)
--- a/libevdev/Makefile.am
+++ b/libevdev/Makefile.am
@@ -28,7 +28,7 @@ libevdevincludedir = $(includedir)/libevdev-1.0/libevdev
 libevdevinclude_HEADERS = libevdev.h libevdev-uinput.h
 
 event-names.h: Makefile make-event-names.py
-       $(CAT) $(top_srcdir)/include/linux/input.h $(top_srcdir)/include/linux/input-event-codes.h | $(PYTHON) $(srcdir)/make-event-names.py  > $@
+       $(PYTHON) $(srcdir)/make-event-names.py $(top_srcdir)/include/linux/input.h $(top_srcdir)/include/linux/input-event-codes.h  > $@
 
 
 EXTRA_DIST = make-event-names.py libevdev.sym

diff --git a/libevdev/make-event-names.py b/libevdev/make-event-names.py
index 716c1d7f50ee79663fe657b0fb49899753ca5bb3..820eb5efcfbea2e5f017d9166ebe16f2e3ffd06a 100755 (executable)
--- a/libevdev/make-event-names.py
+++ b/libevdev/make-event-names.py
@@ -195,10 +195,8 @@ def parse_define(bits, line):
                b = getattr(bits, attrname)
                b[value] = name
 
-def parse(fp):
+def parse(lines):
        bits = Bits()
-
-       lines = fp.readlines()
        for line in lines:
                if not line.startswith("#define"):
                        continue
@@ -207,12 +205,14 @@ def parse(fp):
        return bits
 
 def usage(prog):
-       print("Usage: cat <files> | %s" % prog)
+       print("Usage: %s <files>".format(prog))
 
 if __name__ == "__main__":
-       if len(sys.argv) != 1:
+       if len(sys.argv) <= 1:
                usage(sys.argv[0])
                sys.exit(2)
 
-       bits = parse(sys.stdin)
+       from itertools import chain
+       lines = chain(*[open(f).readlines() for f in sys.argv[1:]])
+       bits = parse(lines)
        print_mapping_table(bits)