journal: be more careful when keeping around mmaps we still need

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c90867c8da301a646e3c3277169fceee7b606fc0..69cdeb7145fd7732a38c4911a06b7f64e8f788b6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2182,6 +2182,7 @@ dist_udevkeymap_DATA = \
        keymaps/module-sony \
        keymaps/module-sony-old \
        keymaps/module-sony-vgn \
+       keymaps/module-sony-vpc \
        keymaps/olpc-xo \
        keymaps/onkyo \
        keymaps/oqo-model2 \
@@ -2352,6 +2353,18 @@ journalctl_LDADD = \
        libsystemd-id128-internal.la \
        libsystemd-logs.la
 
+if HAVE_QRENCODE
+journalctl_SOURCES += \
+       src/journal/journal-qrcode.c \
+       src/journal/journal-qrcode.h
+
+journalctl_CFLAGS += \
+       $(QRENCODE_CFLAGS)
+
+journalctl_LDADD += \
+       $(QRENCODE_LIBS)
+endif
+
 test_journal_SOURCES = \
        src/journal/test-journal.c
 
@@ -2384,15 +2397,26 @@ test_journal_stream_LDADD = \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la
 
+test_journal_verify_SOURCES = \
+       src/journal/test-journal-verify.c
+
+test_journal_verify_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la
+
 libsystemd_journal_la_SOURCES = \
        src/journal/sd-journal.c \
        src/systemd/sd-journal.h \
        src/journal/journal-file.c \
        src/journal/journal-file.h \
+       src/journal/journal-vacuum.c \
+       src/journal/journal-vacuum.h \
+       src/journal/journal-verify.c \
+       src/journal/journal-verify.h \
        src/journal/lookup3.c \
        src/journal/lookup3.h \
        src/journal/journal-send.c \
-       src/journal/journal-send.h \
        src/journal/sparse-endian.h \
        src/journal/journal-def.h \
        src/journal/compress.h \
@@ -2441,6 +2465,8 @@ endif
 
 if HAVE_GCRYPT
 libsystemd_journal_la_SOURCES += \
+       src/journal/journal-authenticate.c \
+       src/journal/journal-authenticate.h \
        src/journal/fsprg.c \
        src/journal/fsprg.h
 
@@ -2482,12 +2508,14 @@ noinst_PROGRAMS += \
        test-journal \
        test-journal-send \
        test-journal-match \
-       test-journal-stream
+       test-journal-stream \
+       test-journal-verify
 
 TESTS += \
        test-journal \
        test-journal-match \
-       test-journal-stream
+       test-journal-stream \
+       test-journal-verify
 
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \