X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=91e66fdaee0950769855fb042d17c17ad7dc02d9;hp=0f9ef8eabc5bc8d28d5a17b68098c77a6783c969;hb=7874bcd6028d1efbb4451c8b5cf5b2ac8d77af74;hpb=f9378423b9758861850748aeb49ae0d3300e56e6

diff --git a/Makefile.am b/Makefile.am
index 0f9ef8eab..91e66fdae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -308,12 +308,20 @@ dist_man_MANS = \
 	man/systemd.unit.5 \
 	man/systemd.service.5 \
 	man/daemon.7 \
-	man/systemd.8 \
+	man/systemd.1 \
 	man/sd_notify.3 \
 	man/sd_booted.3 \
 	man/sd_listen_fds.3 \
 	man/sd_is_fifo.3 \
-	man/sd-daemon.7
+	man/sd-daemon.7 \
+	man/runlevel.8 \
+	man/telinit.8 \
+	man/halt.8 \
+	man/shutdown.8 \
+	man/systemd-install.1 \
+	man/pam_systemd.8 \
+	man/systemadm.1 \
+	man/systemctl.1
 
 nodist_man_MANS = \
 	man/systemd.special.7
@@ -327,7 +335,15 @@ dist_noinst_DATA = \
 	man/sd_booted.html \
 	man/sd_listen_fds.html \
 	man/sd_is_fifo.html \
-	man/sd-daemon.html
+	man/sd-daemon.html \
+	man/runlevel.html \
+	man/telinit.html \
+	man/halt.html \
+	man/shutdown.html \
+	man/systemd-install.html \
+	man/pam_systemd.html \
+	man/systemadm.html \
+	man/systemctl.html
 
 nodist_noinst_DATA = \
 	man/systemd.special.html
@@ -344,7 +360,15 @@ EXTRA_DIST += \
 	man/sd_booted.xml \
 	man/sd_listen_fds.xml \
 	man/sd_is_fifo.xml \
-	man/sd-daemon.xml
+	man/sd-daemon.xml \
+	man/runlevel.xml \
+	man/telinit.xml \
+	man/halt.xml \
+	man/shutdown.xml \
+	man/systemd-install.xml \
+	man/pam_systemd.xml \
+	man/systemadm.xml \
+	man/systemctl.xml
 
 systemd_SOURCES = \
 	src/main.c
@@ -570,22 +594,26 @@ CLEANFILES += \
 endif
 
 if HAVE_XSLTPROC
+XSLTPROC_FLAGS = \
+	--nonet \
+	--param funcsynopsis.style "'ansi'"
+
 XSLTPROC_PROCESS_MAN = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o $@ --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 XSLTPROC_PROCESS_MAN_IN = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o ${@:.in=} --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
+	$(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
 	mv ${@:.in=} $@
 
 XSLTPROC_PROCESS_HTML = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o $@ --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
+	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
 
 XSLTPROC_PROCESS_HTML_IN = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o ${@:.in=} --nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \
+	$(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \
 	mv ${@:.in=} $@
 
 man/%.3: man/%.xml
@@ -594,6 +622,12 @@ man/%.3: man/%.xml
 man/%.3.in: man/%.xml.in
 	$(XSLTPROC_PROCESS_MAN)
 
+man/%.1: man/%.xml
+	$(XSLTPROC_PROCESS_MAN)
+
+man/%.1.in: man/%.xml.in
+	$(XSLTPROC_PROCESS_MAN)
+
 man/%.5: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
@@ -623,7 +657,15 @@ CLEANFILES += \
 	man/systemd.special.7.in \
 	man/systemd.unit.html \
 	man/systemd.service.html \
-	man/systemd.special.html.in
+	man/systemd.special.html.in \
+	man/daemon.html \
+	man/runlevel.html \
+	man/sd_booted.html \
+	man/sd-daemon.html \
+	man/sd_is_fifo.html \
+	man/sd_listen_fds.html \
+	man/sd_notify.html \
+	man/systemd.html
 endif
 
 org.freedesktop.systemd1.%.xml: systemd