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: add inline compression support with XZ
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 656909c6c7391cf920e6a9142630c4c64f47b500..7d551a9dcf81c386983da296a98a53d298d80649 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-506,7
+506,8
@@
EXTRA_DIST = \
src/libsystemd-login.sym \
introspect.awk \
src/73-seat-late.rules.in \
src/libsystemd-login.sym \
introspect.awk \
src/73-seat-late.rules.in \
- src/99-systemd.rules.in
+ src/99-systemd.rules.in \
+ man/custom-html.xsl
if ENABLE_BINFMT
EXTRA_DIST += \
if ENABLE_BINFMT
EXTRA_DIST += \
@@
-1027,6
+1028,15
@@
test_journal_CFLAGS = \
test_journal_LDADD = \
libsystemd-basic.la
test_journal_LDADD = \
libsystemd-basic.la
+if HAVE_XZ
+test_journal_SOURCES += \
+ src/journal/compress.c
+test_journal_CFLAGS += \
+ $(XZ_CFLAGS)
+test_journal_LDADD += \
+ $(XZ_LIBS)
+endif
+
systemd_journald_SOURCES = \
src/journal/journald.c \
src/journal/sd-journal.c \
systemd_journald_SOURCES = \
src/journal/journald.c \
src/journal/sd-journal.c \
@@
-1045,6
+1055,15
@@
systemd_journald_LDADD = \
libsystemd-daemon.la \
$(ACL_LIBS)
libsystemd-daemon.la \
$(ACL_LIBS)
+if HAVE_XZ
+systemd_journald_SOURCES += \
+ src/journal/compress.c
+systemd_journald_CFLAGS += \
+ $(XZ_CFLAGS)
+systemd_journald_LDADD += \
+ $(XZ_LIBS)
+endif
+
systemd_journalctl_SOURCES = \
src/journal/journalctl.c \
src/journal/sd-journal.c \
systemd_journalctl_SOURCES = \
src/journal/journalctl.c \
src/journal/sd-journal.c \
@@
-1058,6
+1077,15
@@
systemd_journalctl_CFLAGS = \
systemd_journalctl_LDADD = \
libsystemd-basic.la
systemd_journalctl_LDADD = \
libsystemd-basic.la
+if HAVE_XZ
+systemd_journalctl_SOURCES += \
+ src/journal/compress.c
+systemd_journalctl_CFLAGS += \
+ $(XZ_CFLAGS)
+systemd_journalctl_LDADD += \
+ $(XZ_LIBS)
+endif
+
systemd_stdout_syslog_bridge_SOURCES = \
src/stdout-syslog-bridge.c \
src/tcpwrap.c
systemd_stdout_syslog_bridge_SOURCES = \
src/stdout-syslog-bridge.c \
src/tcpwrap.c
@@
-1758,7
+1786,7
@@
endif
if HAVE_XSLTPROC
XSLTPROC_FLAGS = \
--nonet \
if HAVE_XSLTPROC
XSLTPROC_FLAGS = \
--nonet \
- --
param funcsynopsis.style "'ansi'"
+ --
stringparam funcsynopsis.style ansi
XSLTPROC_PROCESS_MAN = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
XSLTPROC_PROCESS_MAN = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@
-1771,11
+1799,11
@@
XSLTPROC_PROCESS_MAN_IN = \
XSLTPROC_PROCESS_HTML = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
XSLTPROC_PROCESS_HTML = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS)
http://docbook.sourceforge.net/release/xsl/current/html/docbook
.xsl $<
+ $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS)
man/custom-html
.xsl $<
XSLTPROC_PROCESS_HTML_IN = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
XSLTPROC_PROCESS_HTML_IN = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS)
http://docbook.sourceforge.net/release/xsl/current/html/docbook
.xsl $< && \
+ $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS)
man/custom-html
.xsl $< && \
mv ${@:.in=} $@
man/%.1: man/%.xml
mv ${@:.in=} $@
man/%.1: man/%.xml