chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
architecture: add string table entries for mips-le archs which were missing
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 672e93f16e6835a9ee29130b9eedba789d7b28cc..0bf803a1f366dbe36234f9cf69aa9255221c6f70 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-35,16
+35,16
@@
SUBDIRS = . po
# Keep the test-suite.log
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
# 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
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,
LIBSYSTEMD_AGE=3
# The following four libraries only exist for compatibility reasons,
@@
-727,6
+727,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/path-util.h \
src/shared/time-util.c \
src/shared/time-util.h \
src/shared/path-util.h \
src/shared/time-util.c \
src/shared/time-util.h \
+ src/shared/locale-util.c \
+ src/shared/locale-util.h \
src/shared/hashmap.c \
src/shared/hashmap.h \
src/shared/siphash24.c \
src/shared/hashmap.c \
src/shared/hashmap.h \
src/shared/siphash24.c \
@@
-3530,14
+3532,19
@@
test_catalog_CPPFLAGS = \
test_catalog_LDADD = \
libsystemd-journal-core.la
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
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 \
libsystemd_journal_core_la_SOURCES = \
src/journal/journald-kmsg.c \
@@
-3621,9
+3628,9
@@
tests += \
test-mmap-cache \
test-catalog
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 \
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
@@
-3656,10
+3663,10
@@
libsystemd_journal_internal_la_CFLAGS = \
libsystemd_journal_internal_la_LIBADD =
libsystemd_journal_internal_la_LIBADD =
-if HAVE_XZ
libsystemd_journal_internal_la_SOURCES += \
src/journal/compress.c
libsystemd_journal_internal_la_SOURCES += \
src/journal/compress.c
+if HAVE_XZ
libsystemd_journal_internal_la_CFLAGS += \
$(XZ_CFLAGS)
libsystemd_journal_internal_la_CFLAGS += \
$(XZ_CFLAGS)
@@
-3667,6
+3674,11
@@
libsystemd_journal_internal_la_LIBADD += \
$(XZ_LIBS)
endif
$(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 \
if HAVE_GCRYPT
libsystemd_journal_internal_la_SOURCES += \
src/journal/journal-authenticate.c \