journal: make libgcrypt dependency optional

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 837bc6c5b2804838176a2e68ba48adb16ed97eb7..166c357db2db15e385f127dea1c2bd437fe95467 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 \
@@ -2308,17 +2309,9 @@ EXTRA_DIST += \
 systemd_journald_SOURCES = \
        src/journal/journald.c \
        src/journal/journald.h \
-       src/journal/sd-journal.c \
-       src/journal/journal-file.c \
-       src/journal/journal-file.h \
-       src/journal/lookup3.c \
-       src/journal/lookup3.h \
        src/journal/journal-rate-limit.c \
        src/journal/journal-rate-limit.h \
-       src/journal/sparse-endian.h \
-       src/journal/journal-def.h \
-       src/journal/journal-internal.h \
-       src/journal/compress.h
+       src/journal/journal-internal.h
 
 nodist_systemd_journald_SOURCES = \
        src/journal/journald-gperf.c
@@ -2392,11 +2385,31 @@ 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/journal-send.c
+       src/journal/lookup3.h \
+       src/journal/journal-send.c \
+       src/journal/sparse-endian.h \
+       src/journal/journal-def.h \
+       src/journal/compress.h \
+       src/journal/mmap-cache.c \
+       src/journal/mmap-cache.h
 
 libsystemd_journal_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2440,6 +2453,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
 
@@ -2481,12 +2496,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 \