From 6a6633a16a510b40c6ad30cd0858699619384a44 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Fri, 22 Feb 2013 13:33:06 +0100 Subject: python-systemd: check all errors and use automatic cleanup __REALTIME_TIMESTAMP and __MONOTONIC_TIMESTAMP return ints. It doesn't make sense to convert to string, just to convert back to a number later on. Also try to follow systemd rules for indentation. --- Makefile.am | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 4ff0cff8bb..f1c2ce05b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3404,7 +3404,9 @@ _journal_la_LIBADD = \ id128_la_SOURCES = \ src/python-systemd/id128.c \ - src/python-systemd/id128-constants.h + src/python-systemd/id128-constants.h \ + src/python-systemd/pyutil.c \ + src/python-systemd/pyutil.h id128_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -3423,7 +3425,9 @@ id128_la_LIBADD = \ libsystemd-id128.la _reader_la_SOURCES = \ - src/python-systemd/_reader.c + src/python-systemd/_reader.c \ + src/python-systemd/pyutil.c \ + src/python-systemd/pyutil.h _reader_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -3439,7 +3443,8 @@ _reader_la_LDFLAGS = \ _reader_la_LIBADD = \ $(PYTHON_LIBS) \ libsystemd-journal.la \ - libsystemd-id128.la + libsystemd-id128.la \ + libsystemd-shared.la dist_pkgpyexec_PYTHON = \ src/python-systemd/journal.py \ @@ -3447,7 +3452,7 @@ dist_pkgpyexec_PYTHON = \ src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(SED) -n -r 's/,//g; s/#define (SD_MESSAGE_[A-Z0-9_]+)\s.*/add_id(m, "\1", \1);/p' <$< >$@ + $(AM_V_GEN)$(SED) -n -r 's/,//g; s/#define (SD_MESSAGE_[A-Z0-9_]+)\s.*/add_id(m, "\1", \1) JOINER/p' <$< >$@ BUILT_SOURCES += \ src/python-systemd/id128-constants.h -- cgit v1.2.3-54-g00ecf