X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=e9be6facc67a81d881c31b71b727caeb2fa980f8;hb=3408ba015aee3a88c91962c028738be757779519;hp=672e93f16e6835a9ee29130b9eedba789d7b28cc;hpb=30ae9dfda3788cdfaf1b84d124dbc7feb638c77b;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 672e93f16..e9be6facc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,16 +35,16 @@ SUBDIRS = . po # Keep the test-suite.log .PRECIOUS: $(TEST_SUITE_LOG) Makefile -LIBUDEV_CURRENT=5 -LIBUDEV_REVISION=1 -LIBUDEV_AGE=4 +LIBUDEV_CURRENT=6 +LIBUDEV_REVISION=0 +LIBUDEV_AGE=5 LIBGUDEV_CURRENT=2 LIBGUDEV_REVISION=0 LIBGUDEV_AGE=2 LIBSYSTEMD_CURRENT=3 -LIBSYSTEMD_REVISION=0 +LIBSYSTEMD_REVISION=1 LIBSYSTEMD_AGE=3 # The following four libraries only exist for compatibility reasons, @@ -3530,14 +3530,19 @@ test_catalog_CPPFLAGS = \ test_catalog_LDADD = \ libsystemd-journal-core.la -if HAVE_XZ test_compress_SOURCES = \ src/journal/test-compress.c test_compress_LDADD = \ libsystemd-journal-internal.la \ libsystemd-shared.la -endif + +test_compress_benchmark_SOURCES = \ + src/journal/test-compress-benchmark.c + +test_compress_benchmark_LDADD = \ + libsystemd-journal-internal.la \ + libsystemd-shared.la libsystemd_journal_core_la_SOURCES = \ src/journal/journald-kmsg.c \ @@ -3621,9 +3626,9 @@ tests += \ test-mmap-cache \ test-catalog -if HAVE_XZ -tests += test-compress -endif +tests += \ + test-compress \ + test-compress-benchmark pkginclude_HEADERS += \ src/systemd/sd-journal.h \ @@ -3656,10 +3661,10 @@ libsystemd_journal_internal_la_CFLAGS = \ libsystemd_journal_internal_la_LIBADD = -if HAVE_XZ libsystemd_journal_internal_la_SOURCES += \ src/journal/compress.c +if HAVE_XZ libsystemd_journal_internal_la_CFLAGS += \ $(XZ_CFLAGS) @@ -3667,6 +3672,11 @@ libsystemd_journal_internal_la_LIBADD += \ $(XZ_LIBS) endif +if HAVE_LZ4 +libsystemd_journal_internal_la_LIBADD += \ + -llz4 +endif + if HAVE_GCRYPT libsystemd_journal_internal_la_SOURCES += \ src/journal/journal-authenticate.c \