summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-07-13 00:29:26 +0200
committerLennart Poettering <lennart@poettering.net>2012-07-13 00:32:32 +0200
commitcbdca8525b4f36297cb9e5cb090a9648763ed1bf (patch)
tree1d4665994000b53b132e93d6e0c628d39ff9b706 /Makefile.am
parent362a3f8122e070589a4d61f7752b990090c75432 (diff)
journal: beef up journal matches considerably
we now can take multiple matches, and they will apply as AND if they apply to different fields and OR if they apply to the same fields. Also, terms of this kind can be combined with an overreaching OR.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am40
1 files changed, 21 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am
index aedd22052b..14f9455b51 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2232,29 +2232,13 @@ journalctl_LDADD = \
libsystemd-logs.la
test_journal_SOURCES = \
- src/journal/test-journal.c \
- src/journal/sd-journal.c \
- src/journal/journal-file.c \
- src/journal/lookup3.c \
- src/journal/journal-send.c
+ src/journal/test-journal.c
test_journal_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la \
+ libsystemd-journal-internal.la \
libsystemd-id128-internal.la
-if HAVE_XZ
-test_journal_SOURCES += \
- src/journal/compress.c
-
-test_journal_CFLAGS = \
- $(AM_CFLAGS) \
- $(XZ_CFLAGS)
-
-test_journal_LDADD += \
- $(XZ_LIBS)
-endif
-
test_journal_send_SOURCES = \
src/journal/test-journal-send.c
@@ -2263,6 +2247,22 @@ test_journal_send_LDADD = \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la
+test_journal_match_SOURCES = \
+ src/journal/test-journal-match.c
+
+test_journal_match_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
+
+test_journal_stream_SOURCES = \
+ src/journal/test-journal-stream.c
+
+test_journal_stream_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
+
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
src/journal/journal-file.c \
@@ -2327,7 +2327,9 @@ UNINSTALL_EXEC_HOOKS += \
noinst_PROGRAMS += \
test-journal \
- test-journal-send
+ test-journal-send \
+ test-journal-match \
+ test-journal-stream
pkginclude_HEADERS += \
src/systemd/sd-journal.h \