chiark / gitweb /
man: document variable substitution
[elogind.git] / Makefile.am
index 0f9ef8eabc5bc8d28d5a17b68098c77a6783c969..dfea23df4f0c09e863ca3dbbe14172d5d36c0767 100644 (file)
@@ -38,10 +38,12 @@ systemunitdir=$(rootdir)/lib/systemd/system
 
 AM_CPPFLAGS = \
         -include $(top_builddir)/config.h \
+       -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
        -DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
        -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
        -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
        -DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
+       -DSESSION_CONFIG_FILE=\"$(pkgsysconfdir)/session.conf\" \
        -DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
        -DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
        -DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
@@ -81,6 +83,9 @@ pamlib_LTLIBRARIES = \
        pam_systemd.la
 endif
 
+dist_pkgsysconf_DATA = \
+       src/system.conf
+
 dist_dbuspolicy_DATA = \
        src/org.freedesktop.systemd1.conf
 
@@ -116,7 +121,6 @@ dist_systemunit_DATA = \
        units/mail-transfer-agent.target \
        units/poweroff.target \
        units/reboot.target \
-       units/remote-fs.target \
        units/rescue.target \
        units/rpcbind.target \
        units/rtc-set.target \
@@ -139,19 +143,21 @@ dist_systemunit_DATA = \
        units/var-lock.mount \
        units/var-run.mount
 
-systemunit_DATA = \
+nodist_systemunit_DATA = \
        units/sysinit.target \
        units/getty@.service \
        units/graphical.target \
+       units/remote-fs.target \
        units/multi-user.target \
        units/systemd-initctl.service \
        units/systemd-logger.service \
-       units/syslog.target
+       units/syslog.target \
+       units/dbus.target
 
 dist_sessionunit_DATA = \
        units/session/default.target
 
-sessionunit_DATA = \
+nodist_sessionunit_DATA = \
        units/session/remote-fs.target \
        units/session/exit.service
 
@@ -164,6 +170,7 @@ EXTRA_DIST = \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
        units/syslog.target.in \
+       units/dbus.target.in \
        units/session/exit.service.in \
        systemd.pc.in
 
@@ -217,10 +224,6 @@ noinst_LTLIBRARIES = \
        libsystemd-basic.la \
        libsystemd-core.la
 
-# This is needed because automake is buggy in how it generates the
-# rules for C programs, but not Vala programs.  We therefore can't
-# list the .h files as dependencies if we want make dist to work.
-
 libsystemd_basic_la_SOURCES = \
         src/util.c \
         src/hashmap.c \
@@ -269,6 +272,7 @@ libsystemd_core_la_SOURCES = \
        src/hostname-setup.c \
        src/loopback-setup.c \
        src/kmod-setup.c \
+       src/modprobe-setup.c \
        src/utmp-wtmp.c \
        src/specifier.c \
        src/unit-name.c \
@@ -291,6 +295,10 @@ libsystemd_core_la_LIBADD = \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS)
 
+# This is needed because automake is buggy in how it generates the
+# rules for C programs, but not Vala programs.  We therefore can't
+# list the .h files as dependencies if we want make dist to work.
+
 EXTRA_DIST += \
        ${libsystemd_basic_la_SOURCES:.c=.h} \
        ${libsystemd_core_la_SOURCES:.c=.h} \
@@ -302,49 +310,82 @@ EXTRA_DIST += \
        src/linux/auto_dev-ioctl.h \
        src/initreq.h \
        src/sd-daemon.h \
-       src/special.h
-
-dist_man_MANS = \
-       man/systemd.unit.5 \
-       man/systemd.service.5 \
-       man/daemon.7 \
-       man/systemd.8 \
+       src/special.h \
+       src/dbus-common.h \
+       src/bus-errors.h
+
+MANPAGES = \
+       man/systemd.1 \
+       man/systemctl.1 \
+       man/systemadm.1 \
+       man/systemd-install.1 \
+       man/systemd-notify.1 \
        man/sd_notify.3 \
        man/sd_booted.3 \
        man/sd_listen_fds.3 \
        man/sd_is_fifo.3 \
-       man/sd-daemon.7
+       man/systemd.unit.5 \
+       man/systemd.service.5 \
+       man/systemd.socket.5 \
+       man/systemd.mount.5 \
+       man/systemd.automount.5 \
+       man/systemd.swap.5 \
+       man/systemd.timer.5 \
+       man/systemd.path.5 \
+       man/systemd.target.5 \
+       man/systemd.device.5 \
+       man/systemd.snapshot.5 \
+       man/systemd.exec.5 \
+       man/daemon.7 \
+       man/sd-daemon.7 \
+       man/runlevel.8 \
+       man/telinit.8 \
+       man/halt.8 \
+       man/shutdown.8 \
+       man/pam_systemd.8 \
+       man/systemd.conf.5
+
+MANPAGES_ALIAS = \
+       man/reboot.8 \
+       man/poweroff.8 \
+       man/sd_is_socket.3 \
+       man/sd_is_socket_unix.3 \
+       man/sd_is_socket_inet.3 \
+       man/sd_notifyf.3 \
+       man/init.1
+
+man/reboot.8: man/halt.8
+man/poweroff.8: man/halt.8
+man/sd_is_socket.3: man/sd_is_fifo.3
+man/sd_is_socket_unix.3: man/sd_is_fifo.3
+man/sd_is_socket_inet.3: man/sd_is_fifo.3
+man/sd_notifyf.3: man/sd_notify.3
+man/init.1: man/systemd.1
+
+dist_man_MANS = \
+       $(MANPAGES) \
+       $(MANPAGES_ALIAS)
 
 nodist_man_MANS = \
        man/systemd.special.7
 
+XML_FILES = \
+       ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
+
+XML_IN_FILES = \
+       ${patsubst %.1,%.xml.in,${patsubst %.3,%.xml.in,${patsubst %.5,%.xml.in,${patsubst %.7,%.xml.in,${patsubst %.8,%.xml.in,$(nodist_man_MANS)}}}}}
+
 dist_noinst_DATA = \
-       man/systemd.unit.html \
-       man/systemd.service.html \
-       man/daemon.html \
-       man/systemd.html \
-       man/sd_notify.html \
-       man/sd_booted.html \
-       man/sd_listen_fds.html \
-       man/sd_is_fifo.html \
-       man/sd-daemon.html
+       ${XML_FILES:.xml=.html}
 
 nodist_noinst_DATA = \
-       man/systemd.special.html
+       ${XML_IN_FILES:.xml.in=.html}
 
 EXTRA_DIST += \
-       man/systemd.unit.xml \
-       man/systemd.service.xml \
-       man/systemd.special.xml.in \
-       man/systemd.special.7.in \
-       man/systemd.special.html.in \
-       man/daemon.xml \
-       man/systemd.xml \
-       man/sd_notify.xml \
-       man/sd_booted.xml \
-       man/sd_listen_fds.xml \
-       man/sd_is_fifo.xml \
-       man/sd-daemon.xml
+       $(XML_FILES) \
+       $(XML_IN_FILES) \
+       ${nodist_man_MANS:=.in} \
+       ${XML_IN_FILES:.xml.in=.html.in}
 
 systemd_SOURCES = \
        src/main.c
@@ -413,7 +454,8 @@ systemd_logger_LDADD = \
 
 systemd_initctl_SOURCES = \
        src/initctl.c \
-       src/sd-daemon.c
+       src/sd-daemon.c \
+       src/dbus-common.c
 
 systemd_initctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -436,7 +478,8 @@ systemd_cgroups_agent_LDADD = \
 
 systemctl_SOURCES = \
        src/systemctl.c \
-       src/utmp-wtmp.c
+       src/utmp-wtmp.c \
+       src/dbus-common.c
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -455,12 +498,13 @@ systemd_notify_LDADD = \
 
 systemd_install_SOURCES = \
        src/install.c \
-       src/path-lookup.c
+       src/path-lookup.c \
+       src/dbus-common.c
 
 systemd_install_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       $(DBUS_LIBS)
 
-# We don't really link here against D-Bus, however we indirectly include D-Bus header files
 systemd_install_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
@@ -549,45 +593,46 @@ units/session/%: units/%.m4 Makefile
        $(M4_PROCESS_SESSION)
 
 CLEANFILES = \
-       units/systemd-initctl.service \
-       units/systemd-logger.service \
-       units/syslog.target \
-       units/sysinit.target \
-       units/getty@.service \
-       units/graphical.target \
-       units/multi-user.target \
-       units/remote-fs.target \
-       units/session/remote-fs.target \
-       units/session/exit.service \
-       man/systemd.special.7 \
-       man/systemd.special.html \
-       systemd.pc
+       $(nodist_systemunit_DATA) \
+       $(nodist_sessionunit_DATA) \
+       $(nodist_man_MANS) \
+       ${XML_IN_FILES:.xml.in=.html} \
+       $(pkgconfigdata_DATA)
 
 if HAVE_VALAC
 CLEANFILES += \
-       src/systemd-interfaces.c \
-       src/systemadm.c
+       ${systemadm_SOURCES:.vala=.c}
 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/%.1: man/%.xml
+       $(XSLTPROC_PROCESS_MAN)
+
+man/%.1.in: man/%.xml.in
+       $(XSLTPROC_PROCESS_MAN)
+
 man/%.3: man/%.xml
        $(XSLTPROC_PROCESS_MAN)
 
@@ -620,16 +665,16 @@ man/%.html.in: man/%.xml.in
 
 CLEANFILES += \
        $(dist_man_MANS) \
-       man/systemd.special.7.in \
-       man/systemd.unit.html \
-       man/systemd.service.html \
-       man/systemd.special.html.in
+       ${nodist_man_MANS:=.in} \
+       ${XML_FILES:.xml=.html} \
+       ${XML_IN_FILES:.xml.in=.html.in}
 endif
 
 org.freedesktop.systemd1.%.xml: systemd
        $(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@
 
-CLEANFILES += $(dbusinterface_DATA)
+CLEANFILES += \
+       $(dbusinterface_DATA)
 
 install-data-hook:
        $(MKDIR_P) -m 0755 \
@@ -706,8 +751,8 @@ if TARGET_FEDORA
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) ../display-manager.service display-manager.service )
+               rm -f prefdm.service && \
+               $(LN_S) ../prefdm.service prefdm.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f rc-local.service && \
                $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
@@ -722,8 +767,8 @@ if TARGET_GENTOO
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/xdm.service display-manager.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) ../display-manager.service display-manager.service )
+               rm -f prefdm.service && \
+               $(LN_S) ../prefdm.service prefdm.service )
 endif
 
 DISTCHECK_CONFIGURE_FLAGS = \