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: generate xml not html for index
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 2232a1d38b0064a27012198446608db7c81da65d..9c7267b06491db2fb2ce45a3bf8de70e56ef4f4f 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-377,24
+377,22
@@
EXTRA_DIST += \
introspect.awk \
man/custom-html.xsl
introspect.awk \
man/custom-html.xsl
-if HAVE_KMOD
EXTRA_DIST += \
units/systemd-modules-load.service.in
EXTRA_DIST += \
units/systemd-modules-load.service.in
-endif
if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \
units/rc-local.service \
units/halt-local.service
if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \
units/rc-local.service \
units/halt-local.service
-EXTRA_DIST += \
- units/rc-local.service.in \
- units/halt-local.service.in
-
systemgenerator_PROGRAMS += \
systemd-rc-local-generator
endif
systemgenerator_PROGRAMS += \
systemd-rc-local-generator
endif
+EXTRA_DIST += \
+ units/rc-local.service.in \
+ units/halt-local.service.in
+
dist_doc_DATA = \
README \
NEWS \
dist_doc_DATA = \
README \
NEWS \
@@
-684,23
+682,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 \
@@
-716,13
+703,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
@@
-769,6
+762,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/strv.h \
src/shared/strbuf.c \
src/shared/strbuf.h \
src/shared/strv.h \
src/shared/strbuf.c \
src/shared/strbuf.h \
+ src/shared/strxcpyx.c \
+ src/shared/strxcpyx.h \
src/shared/conf-parser.c \
src/shared/conf-parser.h \
src/shared/log.c \
src/shared/conf-parser.c \
src/shared/conf-parser.h \
src/shared/log.c \
@@
-3690,6
+3685,7
@@
MANPAGES_ALIAS += \
man/sd_session_get_type.3 \
man/sd_session_get_class.3 \
man/sd_session_get_display.3 \
man/sd_session_get_type.3 \
man/sd_session_get_class.3 \
man/sd_session_get_display.3 \
+ man/sd_session_get_tty.3 \
man/sd_pid_get_owner_uid.3 \
man/sd_pid_get_unit.3 \
man/sd_uid_is_on_seat.3 \
man/sd_pid_get_owner_uid.3 \
man/sd_pid_get_unit.3 \
man/sd_uid_is_on_seat.3 \
@@
-3714,6
+3710,7
@@
man/sd_session_get_state.3: man/sd_session_is_active.3
man/sd_session_get_type.3: man/sd_session_is_active.3
man/sd_session_get_class.3: man/sd_session_is_active.3
man/sd_session_get_display.3: man/sd_session_is_active.3
man/sd_session_get_type.3: man/sd_session_is_active.3
man/sd_session_get_class.3: man/sd_session_is_active.3
man/sd_session_get_display.3: man/sd_session_is_active.3
+man/sd_session_get_tty.3: man/sd_session_is_active.3
man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
man/sd_pid_get_unit.3: man/sd_pid_get_session.3
man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
man/sd_pid_get_unit.3: man/sd_pid_get_session.3
man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
@@
-3942,16
+3939,16
@@
docs/sysvinit/README: docs/sysvinit/README.in
docs/var-log/README: docs/var-log/README.in
$(SED_PROCESS)
docs/var-log/README: docs/var-log/README.in
$(SED_PROCESS)
-EXTRA_DIST += \
- docs/sysvinit/README.in \
- docs/var-log/README.in
-
CLEANFILES += \
docs/sysvinit/README \
docs/var-log/README
endif
CLEANFILES += \
docs/sysvinit/README \
docs/var-log/README
endif
+EXTRA_DIST += \
+ docs/sysvinit/README.in \
+ docs/var-log/README.in
+
EXTRA_DIST += \
shell-completion/systemd-zsh-completion.zsh
EXTRA_DIST += \
shell-completion/systemd-zsh-completion.zsh
@@
-4105,11
+4102,14
@@
DISTCHECK_CONFIGURE_FLAGS = \
--with-rootprefix=$$dc_install_base \
--disable-split-usr
--with-rootprefix=$$dc_install_base \
--disable-split-usr
-
if HAVE_SYSV_COMPAT
DISTCHECK_CONFIGURE_FLAGS += \
--with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
--with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
if HAVE_SYSV_COMPAT
DISTCHECK_CONFIGURE_FLAGS += \
--with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
--with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
+else
+DISTCHECK_CONFIGURE_FLAGS += \
+ --with-sysvinit-path= \
+ --with-sysvrcnd-path=
endif
if ENABLE_GTK_DOC
endif
if ENABLE_GTK_DOC