chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: document the _SYSTEMD_USER_UNIT journal field
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index e10e421d43ff3e8ad73f7deb3721dcf7cc3e7e5d..ab9fb99f96ee586cf6d458cca52226259b86c18d 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-118,8
+118,9
@@
dbusinterface_DATA =
dist_dbussystemservice_DATA =
check_PROGRAMS =
check_DATA =
dist_dbussystemservice_DATA =
check_PROGRAMS =
check_DATA =
-noinst_PROGRAMS =
-TESTS =
+noinst_tests=
+noinst_PROGRAMS = $(noinst_tests)
+TESTS = $(noinst_tests)
udevlibexec_PROGRAMS =
AM_CPPFLAGS = \
udevlibexec_PROGRAMS =
AM_CPPFLAGS = \
@@
-259,7
+260,6
@@
dist_systemunit_DATA = \
units/network.target \
units/nss-lookup.target \
units/nss-user-lookup.target \
units/network.target \
units/nss-lookup.target \
units/nss-user-lookup.target \
- units/mail-transfer-agent.target \
units/hibernate.target \
units/hybrid-sleep.target \
units/poweroff.target \
units/hibernate.target \
units/hybrid-sleep.target \
units/poweroff.target \
@@
-292,7
+292,6
@@
dist_systemunit_DATA = \
units/quotaon.service \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
units/quotaon.service \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
- units/syslog.target \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target
@@
-682,23
+681,12
@@
CLEANFILES += \
${XML_FILES:.xml=.html}
if HAVE_PYTHON
${XML_FILES:.xml=.html}
if HAVE_PYTHON
-noinst_DATA += \
- man/index.html
-
-CLEANFILES += \
- man/index.html
-
-man/index.html: make-man-index.py $(XML_FILES)
- $(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(PYTHON) $^ > $@
-
MANPAGES += \
MANPAGES += \
- man/systemd.directives.5
-
-EXTRA_DIST += \
- man/index.html
+ man/systemd.index.7 \
+ man/systemd.directives.7
XML_DIRECTIVE_FILES = \
XML_DIRECTIVE_FILES = \
+ man/systemd.xml \
man/systemd.unit.xml \
man/systemd.service.xml \
man/systemd.socket.xml \
man/systemd.unit.xml \
man/systemd.service.xml \
man/systemd.socket.xml \
@@
-714,13
+702,19
@@
XML_DIRECTIVE_FILES = \
man/systemd.device.xml \
man/systemd.conf.xml \
man/systemd.journal-fields.xml \
man/systemd.device.xml \
man/systemd.conf.xml \
man/systemd.journal-fields.xml \
- man/systemd.time.xml
+ man/systemd.time.xml \
+ man/bootchart.conf.xml
+
+man/systemd.index.xml: make-man-index.py $(filter-out man/systemd.index.xml,$(XML_FILES))
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)$(PYTHON) $^ > $@
man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(PYTHON) $^ > $@
EXTRA_DIST += \
man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(PYTHON) $^ > $@
EXTRA_DIST += \
+ man/systemd.index.xml \
man/systemd.directives.xml
endif
man/systemd.directives.xml
endif
@@
-809,7
+803,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/time-dst.c \
src/shared/time-dst.h \
src/shared/calendarspec.c \
src/shared/time-dst.c \
src/shared/time-dst.h \
src/shared/calendarspec.c \
- src/shared/calendarspec.h
+ src/shared/calendarspec.h \
+ src/shared/output-mode.h
libsystemd_shared_la_LIBADD = libsystemd-daemon.la
libsystemd_shared_la_LIBADD = libsystemd-daemon.la
@@
-1179,27
+1174,16
@@
CLEANFILES += \
# ------------------------------------------------------------------------------
noinst_PROGRAMS += \
test-engine \
# ------------------------------------------------------------------------------
noinst_PROGRAMS += \
test-engine \
- test-job-type \
test-ns \
test-loopback \
test-hostname \
test-daemon \
test-cgroup \
test-ns \
test-loopback \
test-hostname \
test-daemon \
test-cgroup \
- test-env-replace \
- test-strv \
test-install \
test-watchdog \
test-install \
test-watchdog \
- test-unit-name \
- test-log \
- test-unit-file \
- test-date \
- test-sleep \
- test-replace-var \
- test-sched-prio \
- test-calendarspec \
- test-strip-tab-ansi
+ test-log
-
TESTS
+= \
+
noinst_tests
+= \
test-job-type \
test-env-replace \
test-strv \
test-job-type \
test-env-replace \
test-strv \
@@
-2444,10
+2428,7
@@
test_id128_LDADD = \
libsystemd-shared.la \
libsystemd-id128-internal.la
libsystemd-shared.la \
libsystemd-id128-internal.la
-noinst_PROGRAMS += \
- test-id128
-
-TESTS += \
+noinst_tests += \
test-id128
pkginclude_HEADERS += \
test-id128
pkginclude_HEADERS += \
@@
-2737,17
+2718,10
@@
UNINSTALL_DATA_HOOKS += \
catalog-remove-hook
noinst_PROGRAMS += \
catalog-remove-hook
noinst_PROGRAMS += \
- test-journal \
- test-journal-send \
- test-journal-syslog \
- test-journal-match \
test-journal-enum \
test-journal-enum \
- test-journal-stream \
- test-journal-verify \
- test-mmap-cache \
test-catalog
test-catalog
-
TESTS
+= \
+
noinst_tests
+= \
test-journal \
test-journal-send \
test-journal-syslog \
test-journal \
test-journal-send \
test-journal-syslog \
@@
-2825,7
+2799,9
@@
rootlibexec_PROGRAMS += \
systemd-journal-gatewayd
systemd_journal_gatewayd_SOURCES = \
systemd-journal-gatewayd
systemd_journal_gatewayd_SOURCES = \
- src/journal/journal-gatewayd.c
+ src/journal/journal-gatewayd.c \
+ src/journal/microhttpd-util.h \
+ src/journal/microhttpd-util.c
systemd_journal_gatewayd_LDADD = \
libsystemd-shared.la \
systemd_journal_gatewayd_LDADD = \
libsystemd-shared.la \