strv: make strv_extend() smarter

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 11bb9b3c4c265d2712cd9b7fbd78d6d0675fddc1..db68522bf61fd11f0349c976218b090806270faf 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 \
@@ -292,7 +291,6 @@ dist_systemunit_DATA = \
        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
@@ -682,23 +680,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 \
@@ -714,13 +701,19 @@ XML_DIRECTIVE_FILES = \
        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.index.xml \
        man/systemd.directives.xml
 
 endif
@@ -809,7 +802,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
 
@@ -3690,6 +3684,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_tty.3 \
        man/sd_pid_get_owner_uid.3 \
        man/sd_pid_get_unit.3 \
        man/sd_uid_is_on_seat.3 \
@@ -3714,6 +3709,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_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
@@ -4105,11 +4101,14 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --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)
+else
+DISTCHECK_CONFIGURE_FLAGS += \
+       --with-sysvinit-path= \
+       --with-sysvrcnd-path=
 endif
 
 if ENABLE_GTK_DOC