chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: implement basic journal file verification logic
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 278da18e1124be9ef5d284fa01e56230eff25679..f220b59c9ce5e6f0d002d22a54e8d4db83e5df33 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-26,29
+26,29
@@
SUBDIRS = . po
# remove targets if the command fails
.DELETE_ON_ERROR:
# remove targets if the command fails
.DELETE_ON_ERROR:
-LIBUDEV_CURRENT=
1
-LIBUDEV_REVISION=
3
-LIBUDEV_AGE=
0
+LIBUDEV_CURRENT=
2
+LIBUDEV_REVISION=
0
+LIBUDEV_AGE=
1
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=2
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=3
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=2
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=
1
+LIBSYSTEMD_LOGIN_REVISION=
2
LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=
3
+LIBSYSTEMD_DAEMON_REVISION=
4
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=
7
+LIBSYSTEMD_ID128_REVISION=
8
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=
3
+LIBSYSTEMD_JOURNAL_CURRENT=
4
LIBSYSTEMD_JOURNAL_REVISION=0
LIBSYSTEMD_JOURNAL_REVISION=0
-LIBSYSTEMD_JOURNAL_AGE=
3
+LIBSYSTEMD_JOURNAL_AGE=
4
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
@@
-1030,7
+1030,7
@@
BUILT_SOURCES += \
src/core/syscall-list.txt: Makefile
$(AM_V_at)$(MKDIR_P) $(dir $@)
src/core/syscall-list.txt: Makefile
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(CPP) $(
AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]
/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
+ $(AM_V_GEN)$(CPP) $(
CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+\(?.*[0-9]+.*\)?
/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
$(AM_V_at)$(MKDIR_P) $(dir $@)
src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
$(AM_V_at)$(MKDIR_P) $(dir $@)
@@
-2205,7
+2205,7
@@
dist_udevkeymapforcerel_DATA = \
src/udev/keymap/keys.txt: Makefile
$(AM_V_at)$(MKDIR_P) $(dir $@)
src/udev/keymap/keys.txt: Makefile
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+ $(AM_V_GEN)$(CPP) $(
CFLAGS) $(
AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile
$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile
$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
@@
-2308,29
+2308,20
@@
EXTRA_DIST += \
systemd_journald_SOURCES = \
src/journal/journald.c \
src/journal/journald.h \
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/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
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 \
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 += \
if ENABLE_LOGIND
systemd_journald_LDADD += \
@@
-2342,18
+2333,6
@@
systemd_journald_LDADD += \
libsystemd-acl.la
endif
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
systemd_cat_SOURCES = \
src/journal/cat.c
@@
-2364,6
+2343,9
@@
systemd_cat_LDADD = \
journalctl_SOURCES = \
src/journal/journalctl.c
journalctl_SOURCES = \
src/journal/journalctl.c
+journalctl_CFLAGS = \
+ $(AM_CFLAGS)
+
journalctl_LDADD = \
libsystemd-shared.la \
libsystemd-journal-internal.la \
journalctl_LDADD = \
libsystemd-shared.la \
libsystemd-journal-internal.la \
@@
-2402,11
+2384,28
@@
test_journal_stream_LDADD = \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la
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 \
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
+ src/systemd/sd-journal.h \
src/journal/journal-file.c \
src/journal/journal-file.c \
+ src/journal/journal-file.h \
src/journal/lookup3.c \
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) \
libsystemd_journal_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-2425,26
+2424,49
@@
libsystemd_journal_la_LIBADD = \
libsystemd_journal_internal_la_SOURCES = \
$(libsystemd_journal_la_SOURCES)
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 += \
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)
$(XZ_CFLAGS)
libsystemd_journal_la_LIBADD += \
$(XZ_LIBS)
-libsystemd_journal_internal_la_CFLAGS = \
- $(AM_CFLAGS)
+libsystemd_journal_internal_la_CFLAGS += \
$(XZ_CFLAGS)
$(XZ_CFLAGS)
-libsystemd_journal_internal_la_LIBADD = \
+libsystemd_journal_internal_la_LIBADD
+
= \
$(XZ_LIBS)
endif
$(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 \
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-journal-install-hook:
if test "$(libdir)" != "$(rootlibdir)"; then \
@@
-2468,12
+2490,14
@@
noinst_PROGRAMS += \
test-journal \
test-journal-send \
test-journal-match \
test-journal \
test-journal-send \
test-journal-match \
- test-journal-stream
+ test-journal-stream \
+ test-journal-verify
TESTS += \
test-journal \
test-journal-match \
TESTS += \
test-journal \
test-journal-match \
- test-journal-stream
+ test-journal-stream \
+ test-journal-verify
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
@@
-3460,7
+3484,7
@@
CLEANFILES += \
${XML_FILES:.xml=.html}
endif
${XML_FILES:.xml=.html}
endif
-DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
+DBUS_PREPROCESS = $(CPP) -P $(
CFLAGS) $(
DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
CLEANFILES += \
$(dbusinterface_DATA)
CLEANFILES += \
$(dbusinterface_DATA)