systemctl,loginctl,cgls: do not ellipsize cgroup members when --full is specified

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 05dcc79f6e6e0e1111d6ec59eabca8b17a1078ce..5692077b34ca0d7d56bec39d75e507cf888999b6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -259,7 +259,6 @@ dist_systemunit_DATA = \
        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 \
@@ -682,23 +681,12 @@ CLEANFILES += \
        ${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 += \
-       man/systemd.directives.5
-
-EXTRA_DIST += \
-       man/index.html
+       man/systemd.index.7 \
+       man/systemd.directives.7
 
 XML_DIRECTIVE_FILES = \
+       man/systemd.xml \
        man/systemd.unit.xml \
        man/systemd.service.xml \
        man/systemd.socket.xml \
@@ -717,11 +705,16 @@ XML_DIRECTIVE_FILES = \
        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.index.xml \
        man/systemd.directives.xml
 
 endif
@@ -810,7 +803,8 @@ libsystemd_shared_la_SOURCES = \
        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