X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=429da59ee75013aef930828fa6371878ee00c1b6;hp=578496206890037432098e3fdd46c045475873cd;hb=7a14d67f7618787a0b829eb360b41a3889801f74;hpb=e30431623a7d871da123cc37055ac49abf2c20ea diff --git a/Makefile.am b/Makefile.am index 578496206..429da59ee 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 @@ -35,20 +36,20 @@ LIBGUDEV_REVISION=2 LIBGUDEV_AGE=1 LIBSYSTEMD_LOGIN_CURRENT=3 -LIBSYSTEMD_LOGIN_REVISION=9 +LIBSYSTEMD_LOGIN_REVISION=10 LIBSYSTEMD_LOGIN_AGE=3 LIBSYSTEMD_DAEMON_CURRENT=0 -LIBSYSTEMD_DAEMON_REVISION=5 +LIBSYSTEMD_DAEMON_REVISION=6 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=15 +LIBSYSTEMD_ID128_REVISION=16 LIBSYSTEMD_ID128_AGE=0 -LIBSYSTEMD_JOURNAL_CURRENT=6 +LIBSYSTEMD_JOURNAL_CURRENT=7 LIBSYSTEMD_JOURNAL_REVISION=0 -LIBSYSTEMD_JOURNAL_AGE=6 +LIBSYSTEMD_JOURNAL_AGE=7 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -421,11 +422,6 @@ systemgenerator_PROGRAMS += \ systemd-rc-local-generator endif -if TARGET_FRUGALWARE -dist_systemunit_DATA += \ - units/frugalware/display-manager.service -endif - if TARGET_SUSE dist_systemunit_DATA += \ units/suse/rc-local.service \ @@ -477,6 +473,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 \ @@ -535,7 +532,8 @@ MANPAGES = \ man/sd_journal_get_usage.3 \ man/sd_journal_add_match.3 \ man/sd_journal_seek_head.3 \ - man/sd_journal_query_unique.3 + man/sd_journal_query_unique.3 \ + man/sd_journal_get_catalog.3 MANPAGES_ALIAS = \ man/reboot.8 \ @@ -610,7 +608,8 @@ MANPAGES_ALIAS = \ man/sd_journal_test_cursor.3 \ man/sd_journal_enumerate_unique.3 \ man/sd_journal_restart_unique.3 \ - man/SD_JOURNAL_FOREACH_UNIQUE.3 + man/SD_JOURNAL_FOREACH_UNIQUE.3 \ + man/sd_journal_get_catalog_for_message_id.3 if HAVE_KMOD MANPAGES += \ @@ -621,6 +620,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 @@ -694,6 +703,7 @@ man/sd_journal_test_cursor.3: man/sd_journal_get_cursor.3 man/sd_journal_enumerate_unique.3: man/sd_journal_query_unique.3 man/sd_journal_restart_unique.3: man/sd_journal_query_unique.3 man/SD_JOURNAL_FOREACH_UNIQUE.3: man/sd_journal_query_unique.3 +man/sd_journal_get_catalog_for_message_id.3: man/sd_journal_get_catalog.3 XML_FILES = \ ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} @@ -743,7 +753,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 $@) @@ -784,6 +795,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 \ @@ -830,7 +843,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 += \ @@ -1095,6 +1110,7 @@ libsystemd_core_la_LIBADD = \ libsystemd-dbus.la \ libsystemd-audit.la \ libsystemd-id128-internal.la \ + libsystemd-daemon.la \ libudev.la \ $(LIBWRAP_LIBS) \ $(PAM_LIBS) \ @@ -1215,7 +1231,8 @@ noinst_PROGRAMS += \ test-date \ test-sleep \ test-replace-var \ - test-sched-prio + test-sched-prio \ + test-calendarspec TESTS += \ test-job-type \ @@ -1226,7 +1243,8 @@ TESTS += \ test-date \ test-sleep \ test-replace-var \ - test-sched-prio + test-sched-prio \ + test-calendarspec EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1317,6 +1335,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 @@ -2390,7 +2414,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 \ @@ -2404,7 +2428,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 @@ -3952,6 +3976,8 @@ CLEANFILES += \ endif +EXTRA_DIST += \ + shell-completion/systemd-zsh-completion.zsh systemd-install-data-hook: $(MKDIR_P) -m 0755 \ @@ -4094,12 +4120,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 && \ @@ -4121,7 +4141,8 @@ distclean-local: $(DISTCLEAN_LOCAL_HOOKS) clean-local: rm -rf $(abs_srcdir)/install-tree - rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt + rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \ + $(abs_srcdir)/hwdb/iab.txt DISTCHECK_CONFIGURE_FLAGS = \ --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \ @@ -4149,6 +4170,7 @@ hwdb-update: wget -N http://www.linux-usb.org/usb.ids && \ wget -N http://pci-ids.ucw.cz/v2.2/pci.ids && \ wget -N http://standards.ieee.org/develop/regauth/oui/oui.txt && \ + wget -N http://standards.ieee.org/develop/regauth/iab/iab.txt && \ ./ids-update.pl ) upload: all distcheck