X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=163a180dc4a086f1c80f6fc2aa06ad01de7ca539;hp=f3bda0176b73e6690f7cccae1dfcf77b57dcc142;hb=81dc4bde12acd0a59ad96a505dbb109a9e4f320e;hpb=4ec24515daa780118709e04cd78dae93f25a8428 diff --git a/Makefile.am b/Makefile.am index f3bda0176..163a180dc 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@ @@ -62,9 +63,11 @@ polkitpolicydir=$(datadir)/polkit-1/actions bashcompletiondir=$(sysconfdir)/bash_completion.d rpmmacrosdir=$(sysconfdir)/rpm sysvinitdir=$(SYSTEM_SYSVINIT_PATH) +sysvrcddir=$(SYSTEM_SYSVRCND_PATH) varlogdir=$(localstatedir)/log systemdstatedir=$(localstatedir)/lib/systemd catalogstatedir=$(systemdstatedir)/catalog +hwdb_bin=/etc/udev/hwdb.bin # Our own, non-special dirs pkgsysconfdir=$(sysconfdir)/systemd @@ -130,6 +133,7 @@ AM_CPPFLAGS = \ -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \ -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \ -DCATALOG_PATH=\"$(catalogstatedir)\" \ + -DHWDB_BIN=\"$(hwdb_bin)\" \ -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \ -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \ -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \ @@ -231,7 +235,6 @@ rootlibexec_PROGRAMS = \ systemd-update-utmp \ systemd-shutdownd \ systemd-shutdown \ - systemd-modules-load \ systemd-remount-fs \ systemd-reply-password \ systemd-fsck \ @@ -240,6 +243,11 @@ rootlibexec_PROGRAMS = \ systemd-sysctl \ systemd-sleep +if HAVE_KMOD +rootlibexec_PROGRAMS += \ + systemd-modules-load +endif + systemgenerator_PROGRAMS = \ systemd-getty-generator \ systemd-fstab-generator \ @@ -320,7 +328,6 @@ nodist_systemunit_DATA = \ units/console-getty.service \ units/systemd-initctl.service \ units/systemd-shutdownd.service \ - units/systemd-modules-load.service \ units/systemd-remount-fs.service \ units/systemd-update-utmp-runlevel.service \ units/systemd-update-utmp-shutdown.service \ @@ -346,6 +353,11 @@ nodist_systemunit_DATA = \ units/systemd-udev-settle.service \ units/debug-shell.service +if HAVE_KMOD +nodist_systemunit_DATA += \ + units/systemd-modules-load.service +endif + dist_userunit_DATA = \ units/user/default.target \ units/user/exit.target @@ -361,7 +373,6 @@ EXTRA_DIST += \ units/rescue.service.m4.in \ units/systemd-initctl.service.in \ units/systemd-shutdownd.service.in \ - units/systemd-modules-load.service.in \ units/systemd-remount-fs.service.in \ units/systemd-update-utmp-runlevel.service.in \ units/systemd-update-utmp-shutdown.service.in \ @@ -390,6 +401,11 @@ EXTRA_DIST += \ introspect.awk \ man/custom-html.xsl +if HAVE_KMOD +EXTRA_DIST += \ + units/systemd-modules-load.service.in +endif + if TARGET_FEDORA dist_systemunit_DATA += \ units/fedora/rc-local.service \ @@ -406,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 \ @@ -462,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 \ @@ -478,8 +490,6 @@ MANPAGES = \ man/locale.conf.5 \ man/os-release.5 \ man/machine-info.5 \ - man/modules-load.d.5 \ - man/systemd-modules-load.service.8 \ man/sysctl.d.5 \ man/systemd-sysctl.service.8 \ man/systemd-ask-password.1 \ @@ -522,13 +532,13 @@ 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 \ man/poweroff.8 \ man/init.1 \ - man/systemd-modules-load.8 \ man/systemd-sysctl.8 \ man/systemd-journald.socket.8 \ man/systemd-journald.8 \ @@ -598,12 +608,31 @@ 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 += \ + man/modules-load.d.5 \ + man/systemd-modules-load.service.8 +MANPAGES_ALIAS += \ + man/systemd-modules-load.8 +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 -man/systemd-modules-load.8: man/systemd-modules-load.service.8 man/systemd-sysctl.8: man/systemd-sysctl.service.8 man/systemd-journald.socket.8: man/systemd-journald.service.8 man/systemd-journald.8: man/systemd-journald.service.8 @@ -674,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)}}}}} @@ -723,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 $@) @@ -764,10 +795,14 @@ 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 \ src/shared/set.h \ + src/shared/fdset.c \ + src/shared/fdset.h \ src/shared/strv.c \ src/shared/strv.h \ src/shared/strbuf.c \ @@ -810,7 +845,11 @@ 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 + +libsystemd_shared_la_LIBADD = libsystemd-daemon.la #------------------------------------------------------------------------------- noinst_LTLIBRARIES += \ @@ -1012,8 +1051,6 @@ libsystemd_core_la_SOURCES = \ src/core/selinux-setup.h \ src/core/ima-setup.c \ src/core/ima-setup.h \ - src/core/kmod-setup.c \ - src/core/kmod-setup.h \ src/core/locale-setup.h \ src/core/locale-setup.c \ src/core/hostname-setup.c \ @@ -1024,8 +1061,6 @@ libsystemd_core_la_SOURCES = \ src/core/mount-setup.h \ src/core/loopback-setup.h \ src/core/loopback-setup.c \ - src/core/fdset.c \ - src/core/fdset.h \ src/core/condition.c \ src/core/condition.h \ src/core/namespace.c \ @@ -1049,6 +1084,12 @@ libsystemd_core_la_SOURCES = \ src/core/audit-fd.c \ src/core/audit-fd.h +if HAVE_KMOD +libsystemd_core_la_SOURCES += \ + src/core/kmod-setup.c \ + src/core/kmod-setup.h +endif + nodist_libsystemd_core_la_SOURCES = \ src/core/load-fragment-gperf.c \ src/core/load-fragment-gperf-nulstr.c \ @@ -1071,6 +1112,7 @@ libsystemd_core_la_LIBADD = \ libsystemd-dbus.la \ libsystemd-audit.la \ libsystemd-id128-internal.la \ + libsystemd-daemon.la \ libudev.la \ $(LIBWRAP_LIBS) \ $(PAM_LIBS) \ @@ -1191,7 +1233,9 @@ noinst_PROGRAMS += \ test-date \ test-sleep \ test-replace-var \ - test-sched-prio + test-sched-prio \ + test-calendarspec \ + test-strip-tab-ansi TESTS += \ test-job-type \ @@ -1202,7 +1246,9 @@ TESTS += \ test-date \ test-sleep \ test-replace-var \ - test-sched-prio + test-sched-prio \ + test-calendarspec \ + test-strip-tab-ansi EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1293,6 +1339,18 @@ 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_strip_tab_ansi_SOURCES = \ + src/test/test-strip-tab-ansi.c + +test_strip_tab_ansi_LDADD = \ + libsystemd-shared.la + test_daemon_SOURCES = \ src/test/test-daemon.c @@ -1403,6 +1461,7 @@ systemd_shutdown_LDADD = \ libsystemd-shared.la \ libudev.la +if HAVE_KMOD # ------------------------------------------------------------------------------ systemd_modules_load_SOURCES = \ src/modules-load/modules-load.c @@ -1414,6 +1473,7 @@ systemd_modules_load_CFLAGS = \ systemd_modules_load_LDADD = \ libsystemd-shared.la \ $(KMOD_LIBS) +endif # ------------------------------------------------------------------------------ systemd_tmpfiles_SOURCES = \ @@ -1833,9 +1893,13 @@ dist_udevrules_DATA += \ rules/75-net-description.rules \ rules/75-tty-description.rules \ rules/78-sound-card.rules \ - rules/80-drivers.rules \ rules/95-udev-late.rules +if HAVE_KMOD +dist_udevrules_DATA += \ + rules/80-drivers.rules +endif + dist_udevhwdb_DATA = \ hwdb/20-pci-vendor-product.hwdb \ hwdb/20-pci-classes.hwdb \ @@ -1901,7 +1965,6 @@ libudev_core_la_SOURCES = \ src/udev/udev-builtin-firmware.c \ src/udev/udev-builtin-hwdb.c \ src/udev/udev-builtin-input_id.c \ - src/udev/udev-builtin-kmod.c \ src/udev/udev-builtin-net_id.c \ src/udev/udev-builtin-path_id.c \ src/udev/udev-builtin-usb_id.c \ @@ -1923,6 +1986,11 @@ libudev_core_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DFIRMWARE_PATH="$(FIRMWARE_PATH)" +if HAVE_KMOD +libudev_core_la_SOURCES += \ + src/udev/udev-builtin-kmod.c +endif + if HAVE_BLKID libudev_core_la_SOURCES += \ src/udev/udev-builtin-blkid.c @@ -1962,11 +2030,14 @@ udevadm_LDADD = \ # Update hwdb on installation. Do not bother if installing # in DESTDIR, since this is likely for packaging purposes. hwdb-update-hook: - -test -n "$(DESTDIR)" || udevadm hwdb --update + -test -n "$(DESTDIR)" || $(bindir)/udevadm hwdb --update INSTALL_DATA_HOOKS += \ hwdb-update-hook +hwdb-remove-hook: + -test -n "$(DESTDIR)" || rm -f $(HWDB_BIN) + # ------------------------------------------------------------------------------ TESTS += \ test/udev-test.pl \ @@ -2353,7 +2424,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 \ @@ -2367,7 +2438,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 @@ -3915,6 +3986,8 @@ CLEANFILES += \ endif +EXTRA_DIST += \ + shell-completion/systemd-zsh-completion.zsh systemd-install-data-hook: $(MKDIR_P) -m 0755 \ @@ -4020,7 +4093,6 @@ systemd-install-data-hook: sys-kernel-config.mount \ sys-kernel-debug.mount \ sys-fs-fuse-connections.mount \ - systemd-modules-load.service \ systemd-tmpfiles-setup.service \ systemd-sysctl.service \ systemd-ask-password-console.path && \ @@ -4029,7 +4101,6 @@ systemd-install-data-hook: $(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \ $(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \ $(LN_S) ../sys-fs-fuse-connections.mount sys-fs-fuse-connections.mount && \ - $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \ $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \ $(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \ $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path ) @@ -4040,6 +4111,13 @@ systemd-install-data-hook: rm -f org.freedesktop.systemd1.service && \ $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service ) +if HAVE_KMOD + ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ + rm -f systemd-modules-load.service && \ + $(LN_S) ../systemd-modules-load.service systemd-modules-load.service ) +endif + + if TARGET_FEDORA ( cd $(DESTDIR)$(systemunitdir) && \ rm -f display-manager.service single.service && \ @@ -4052,12 +4130,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 && \ @@ -4079,10 +4151,10 @@ 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-sysvinit-path=$$dc_install_base/$(sysvinitdir) \ --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \ --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \ --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \ @@ -4091,6 +4163,13 @@ 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/$(sysvrcddir) +endif + if ENABLE_GTK_DOC DISTCHECK_CONFIGURE_FLAGS += \ --enable-gtk-doc @@ -4101,6 +4180,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