X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=b40a1c16aa9e58ec9cd97dbf6678e8015c9aa361;hp=804cc04e202abbe3feb04a259de04fd6300453b8;hb=b5a223bfcf2ebcf374973b29870a5e80fb42b8be;hpb=555d5c0cb50dbd195f1aac27fab7bc8a78d11a22

diff --git a/Makefile.am b/Makefile.am
index 804cc04e2..b40a1c16a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
+AUTOMAKE_OPTIONS = color-tests parallel-tests
 
 SUBDIRS = . po
 
@@ -477,6 +478,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 +625,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 +758,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 +800,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 +848,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 +1235,8 @@ noinst_PROGRAMS += \
 	test-date \
 	test-sleep \
 	test-replace-var \
-	test-sched-prio
+	test-sched-prio \
+	test-calendarspec
 
 TESTS += \
 	test-job-type \
@@ -1229,7 +1247,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 +1339,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
 
@@ -2393,7 +2418,7 @@ dist_udevkeymap_DATA = \
 	keymaps/onkyo \
 	keymaps/oqo-model2 \
 	keymaps/samsung-other \
-	keymaps/samsung-90x3a \
+	keymaps/samsung-series-9 \
 	keymaps/samsung-sq1us \
 	keymaps/samsung-sx20s \
 	keymaps/toshiba-satellite_a100 \
@@ -2407,7 +2432,7 @@ dist_udevkeymapforcerel_DATA = \
 	keymaps-force-release/dell-xps \
 	keymaps-force-release/hp-other \
 	keymaps-force-release/samsung-other \
-	keymaps-force-release/samsung-90x3a \
+	keymaps-force-release/samsung-series-9 \
 	keymaps-force-release/common-volume-keys
 
 src/udev/keymap/keys.txt: Makefile
@@ -4099,12 +4124,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 && \