X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=4569d7a16de10086166c60082887fdb43b07a1fc;hp=d16ec139aaa580e8a5d0e906eec043fd456d0895;hb=ee7c77db55cb105e69f1a088539da602c706c611;hpb=0428ddb729d12563b827510e04663de9cb4056f3

diff --git a/Makefile.am b/Makefile.am
index d16ec139a..4569d7a16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -477,6 +477,7 @@ MANPAGES = \
 	man/systemd.kill.5 \
 	man/systemd.special.7 \
 	man/systemd.journal-fields.7 \
+	man/systemd.time.7 \
 	man/kernel-command-line.7 \
 	man/daemon.7 \
 	man/bootup.7 \
@@ -623,6 +624,16 @@ MANPAGES_ALIAS += \
 man/systemd-modules-load.8: man/systemd-modules-load.service.8
 endif
 
+if HAVE_MICROHTTPD
+MANPAGES += \
+	man/systemd-journal-gatewayd.service.8
+MANPAGES_ALIAS += \
+	man/systemd-journal-gatewayd.socket.8 \
+	man/systemd-journal-gatewayd.8
+man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8
+man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8
+endif
+
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
@@ -746,7 +757,8 @@ XML_DIRECTIVE_FILES = \
 	man/systemd.kill.xml \
 	man/systemd.device.xml \
 	man/systemd.conf.xml \
-	man/systemd.journal-fields.xml
+	man/systemd.journal-fields.xml \
+	man/systemd.time.xml
 
 man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -787,6 +799,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/virt.h \
 	src/shared/path-util.c \
 	src/shared/path-util.h \
+	src/shared/time-util.c \
+	src/shared/time-util.h \
 	src/shared/hashmap.c \
 	src/shared/hashmap.h \
 	src/shared/set.c \
@@ -833,7 +847,9 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/hwclock.c \
 	src/shared/hwclock.h \
 	src/shared/time-dst.c \
-	src/shared/time-dst.h
+	src/shared/time-dst.h \
+	src/shared/calendarspec.c \
+	src/shared/calendarspec.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -1218,7 +1234,8 @@ noinst_PROGRAMS += \
 	test-date \
 	test-sleep \
 	test-replace-var \
-	test-sched-prio
+	test-sched-prio \
+	test-calendarspec
 
 TESTS += \
 	test-job-type \
@@ -1229,7 +1246,8 @@ TESTS += \
 	test-date \
 	test-sleep \
 	test-replace-var \
-	test-sched-prio
+	test-sched-prio \
+	test-calendarspec
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1320,6 +1338,12 @@ test_replace_var_SOURCES = \
 test_replace_var_LDADD = \
 	libsystemd-shared.la
 
+test_calendarspec_SOURCES = \
+	src/test/test-calendarspec.c
+
+test_calendarspec_LDADD = \
+	libsystemd-shared.la
+
 test_daemon_SOURCES = \
 	src/test/test-daemon.c
 
@@ -3955,6 +3979,8 @@ CLEANFILES += \
 
 endif
 
+EXTRA_DIST += \
+	shell-completion/systemd-zsh-completion.zsh
 
 systemd-install-data-hook:
 	$(MKDIR_P) -m 0755 \
@@ -4097,12 +4123,6 @@ if TARGET_MANDRIVA
 		$(LN_S) rescue.service single.service )
 endif
 
-if TARGET_DEBIAN_OR_UBUNTU
-	( cd $(DESTDIR)$(systemunitdir) && \
-		rm -f runlevel5.target && \
-		$(LN_S) multi-user.target runlevel5.target )
-endif
-
 if TARGET_SUSE
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f local.service && \