X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=c90867c8da301a646e3c3277169fceee7b606fc0;hb=16e9f408fa9a9626059bdd6c89dc175e06b9e976;hp=9062dd65dfb9835bdfce7684468841b5b2131d8f;hpb=dbf61afb29e016fe1b4ac48312a782df1d60a3e6;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 9062dd65d..c90867c8d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2308,29 +2308,20 @@ 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
 
-systemd_journald_CFLAGS =
-
 systemd_journald_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-audit.la \
 	libsystemd-daemon.la \
-	libsystemd-id128-internal.la
+	libsystemd-id128-internal.la \
+	libsystemd-journal-internal.la
 
 if ENABLE_LOGIND
 systemd_journald_LDADD += \
@@ -2342,18 +2333,6 @@ systemd_journald_LDADD += \
 	libsystemd-acl.la
 endif
 
-if HAVE_XZ
-systemd_journald_SOURCES += \
-	src/journal/compress.c
-
-systemd_journald_CFLAGS += \
-	$(AM_CFLAGS) \
-	$(XZ_CFLAGS)
-
-systemd_journald_LDADD += \
-	$(XZ_LIBS)
-endif
-
 systemd_cat_SOURCES = \
 	src/journal/cat.c
 
@@ -2364,6 +2343,9 @@ systemd_cat_LDADD = \
 journalctl_SOURCES = \
 	src/journal/journalctl.c
 
+journalctl_CFLAGS = \
+	$(AM_CFLAGS)
+
 journalctl_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-journal-internal.la \
@@ -2404,9 +2386,18 @@ test_journal_stream_LDADD = \
 
 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/lookup3.c \
-	src/journal/journal-send.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 \
+	src/journal/mmap-cache.c \
+	src/journal/mmap-cache.h
 
 libsystemd_journal_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2425,26 +2416,49 @@ libsystemd_journal_la_LIBADD = \
 libsystemd_journal_internal_la_SOURCES = \
 	$(libsystemd_journal_la_SOURCES)
 
+libsystemd_journal_internal_la_CFLAGS = \
+	$(AM_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD =
+
 if HAVE_XZ
 libsystemd_journal_la_SOURCES += \
 	src/journal/compress.c
 
 libsystemd_journal_la_CFLAGS += \
-	$(AM_CFLAGS) \
 	$(XZ_CFLAGS)
 
 libsystemd_journal_la_LIBADD += \
 	$(XZ_LIBS)
 
-libsystemd_journal_internal_la_CFLAGS = \
-	$(AM_CFLAGS)
+libsystemd_journal_internal_la_CFLAGS += \
 	$(XZ_CFLAGS)
 
-libsystemd_journal_internal_la_LIBADD = \
+libsystemd_journal_internal_la_LIBADD += \
 	$(XZ_LIBS)
 
 endif
 
+if HAVE_GCRYPT
+libsystemd_journal_la_SOURCES += \
+	src/journal/fsprg.c \
+	src/journal/fsprg.h
+
+libsystemd_journal_la_CFLAGS += \
+	$(GCRYPT_CFLAGS) \
+	-Wno-pointer-arith
+
+libsystemd_journal_la_LIBADD += \
+	$(GCRYPT_LIBS)
+
+libsystemd_journal_internal_la_CFLAGS += \
+	$(GCRYPT_CFLAGS) \
+	-Wno-pointer-arith
+
+libsystemd_journal_internal_la_LIBADD += \
+	$(GCRYPT_LIBS)
+endif
+
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-journal-install-hook:
 	if test "$(libdir)" != "$(rootlibdir)"; then \