chiark / gitweb /
core: add bus API and systemctl commands for altering cgroup parameters during runtime
[elogind.git] / Makefile.am
index 578496206890037432098e3fdd46c045475873cd..33188294a955cf65eae0dbb97182b1662658a45b 100644 (file)
@@ -1,4 +1,4 @@
-#  -*- Mode: makefile; indent-tabs-mode: t -*- */
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
 #
 #  This file is part of systemd.
 #
@@ -20,6 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
+AUTOMAKE_OPTIONS = color-tests parallel-tests
 
 SUBDIRS = . po
 
@@ -27,28 +28,28 @@ SUBDIRS = . po
 .DELETE_ON_ERROR:
 
 LIBUDEV_CURRENT=3
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=2
 
 LIBGUDEV_CURRENT=1
-LIBGUDEV_REVISION=2
+LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=9
+LIBSYSTEMD_LOGIN_REVISION=11
 LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=5
+LIBSYSTEMD_DAEMON_REVISION=7
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=15
+LIBSYSTEMD_ID128_REVISION=17
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=6
-LIBSYSTEMD_JOURNAL_REVISION=0
-LIBSYSTEMD_JOURNAL_AGE=6
+LIBSYSTEMD_JOURNAL_CURRENT=7
+LIBSYSTEMD_JOURNAL_REVISION=1
+LIBSYSTEMD_JOURNAL_AGE=7
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -62,7 +63,7 @@ polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=$(sysconfdir)/bash_completion.d
 rpmmacrosdir=$(sysconfdir)/rpm
 sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
-sysvrcddir=$(SYSTEM_SYSVRCND_PATH)
+sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
 varlogdir=$(localstatedir)/log
 systemdstatedir=$(localstatedir)/lib/systemd
 catalogstatedir=$(systemdstatedir)/catalog
@@ -141,7 +142,6 @@ AM_CPPFLAGS = \
        -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
        -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
        -DROOTPREFIX=\"$(rootprefix)\" \
-       -DRUNTIME_DIR=\"/run\" \
        -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
        -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
@@ -167,45 +167,16 @@ AM_CFLAGS = $(OUR_CFLAGS)
 AM_LDFLAGS = $(OUR_LDFLAGS)
 
 # ------------------------------------------------------------------------------
-if TARGET_GENTOO
-AM_CPPFLAGS += \
-       -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_ARCH
-AM_CPPFLAGS += \
-       -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_FRUGALWARE
-AM_CPPFLAGS += \
-       -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_MANDRIVA
-AM_CPPFLAGS += \
-       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/bin/setfont\"
-else
-if TARGET_ANGSTROM
-AM_CPPFLAGS += \
-       -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/usr/bin/setfont\"
-else
-if TARGET_MAGEIA
-AM_CPPFLAGS += \
-       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/bin/setfont\"
-else
-AM_CPPFLAGS += \
-       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
-       -DKBD_SETFONT=\"/bin/setfont\"
-endif
-endif
-endif
-endif
-endif
-endif
+
+define move-to-rootlibdir
+       if test "$(libdir)" != "$(rootlibdir)"; then \
+               $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
+               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
+               mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
+       fi
+endef
 
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS = \
@@ -224,9 +195,6 @@ bin_PROGRAMS = \
        systemd-detect-virt \
        systemd-delta
 
-dist_bin_SCRIPTS = \
-       src/analyze/systemd-analyze
-
 rootlibexec_PROGRAMS = \
        systemd \
        systemd-cgroups-agent \
@@ -252,6 +220,15 @@ systemgenerator_PROGRAMS = \
        systemd-fstab-generator \
        systemd-system-update-generator
 
+dist_bin_SCRIPTS = \
+       src/analyze/systemd-analyze
+
+EXTRA_DIST += \
+       src/analyze/systemd-analyze.in
+
+CLEANFILES += \
+       src/analyze/systemd-analyze
+
 dist_bashcompletion_DATA = \
        shell-completion/systemd-bash-completion.sh
 
@@ -400,47 +377,21 @@ 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 \
-       units/fedora/halt-local.service
-systemgenerator_PROGRAMS += \
-       systemd-rc-local-generator
-endif
-
-if TARGET_MANDRIVA
-dist_systemunit_DATA += \
-       units/fedora/rc-local.service \
-       units/fedora/halt-local.service
-systemgenerator_PROGRAMS += \
-       systemd-rc-local-generator
-endif
-
-if TARGET_FRUGALWARE
-dist_systemunit_DATA += \
-       units/frugalware/display-manager.service
-endif
+if HAVE_SYSV_COMPAT
+nodist_systemunit_DATA += \
+       units/rc-local.service \
+       units/halt-local.service
 
-if TARGET_SUSE
-dist_systemunit_DATA += \
-       units/suse/rc-local.service \
-       units/suse/halt-local.service
 systemgenerator_PROGRAMS += \
        systemd-rc-local-generator
 endif
 
-if TARGET_MAGEIA
-dist_systemunit_DATA += \
-       units/fedora/rc-local.service \
-       units/fedora/halt-local.service
-systemgenerator_PROGRAMS += \
-       systemd-rc-local-generator
-endif
+EXTRA_DIST += \
+       units/rc-local.service.in \
+       units/halt-local.service.in
 
 dist_doc_DATA = \
        README \
@@ -477,6 +428,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 +487,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 +563,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 +575,21 @@ 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
+
+if HAVE_MYHOSTNAME
+MANPAGES += \
+       man/nss-myhostname.8
+endif
+
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
@@ -694,6 +663,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 +713,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,14 +755,20 @@ 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 \
        src/shared/strbuf.h \
+       src/shared/strxcpyx.c \
+       src/shared/strxcpyx.h \
        src/shared/conf-parser.c \
        src/shared/conf-parser.h \
        src/shared/log.c \
@@ -830,7 +807,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 += \
@@ -1042,8 +1023,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 \
@@ -1095,6 +1074,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 +1195,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 \
@@ -1226,7 +1208,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 \
@@ -1317,6 +1301,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
 
@@ -1682,22 +1678,13 @@ pkginclude_HEADERS += \
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-daemon-install-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-daemon.so.* $(DESTDIR)$(rootlibdir); \
-       fi
-
-INSTALL_EXEC_HOOKS += \
-       libsystemd-daemon-install-hook
+       libname=libsystemd-daemon.so && $(move-to-rootlibdir)
 
 libsystemd-daemon-uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
 
-UNINSTALL_EXEC_HOOKS += \
-       libsystemd-daemon-uninstall-hook
+INSTALL_EXEC_HOOKS += libsystemd-daemon-install-hook
+UNINSTALL_EXEC_HOOKS += libsystemd-daemon-uninstall-hook
 
 lib_LTLIBRARIES += \
        libsystemd-daemon.la
@@ -1794,20 +1781,14 @@ CLEANFILES += \
        src/libudev/libudev.pc
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libudev-install-move-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libudev.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libudev.so && \
-               mv $(DESTDIR)$(libdir)/libudev.so.* $(DESTDIR)$(rootlibdir); \
-       fi
+libudev-install-hook:
+       libname=libudev.so && $(move-to-rootlibdir)
 
-libudev-uninstall-move-hook:
+libudev-uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libudev.so*
 
-INSTALL_EXEC_HOOKS += libudev-install-move-hook
-UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook
+INSTALL_EXEC_HOOKS += libudev-install-hook
+UNINSTALL_EXEC_HOOKS += libudev-uninstall-hook
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -1859,6 +1840,7 @@ dist_udevrules_DATA += \
        rules/75-net-description.rules \
        rules/75-tty-description.rules \
        rules/78-sound-card.rules \
+       rules/80-net-name-slot.rules \
        rules/95-udev-late.rules
 
 if HAVE_KMOD
@@ -1871,6 +1853,7 @@ dist_udevhwdb_DATA = \
        hwdb/20-pci-classes.hwdb \
        hwdb/20-usb-vendor-product.hwdb \
        hwdb/20-usb-classes.hwdb \
+       hwdb/20-bluetooth-vendor-product.hwdb \
        hwdb/20-acpi-vendor.hwdb \
        hwdb/20-OUI.hwdb
 
@@ -2269,20 +2252,14 @@ CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # HAVE_INTROSPECTION
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libgudev-install-move-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libgudev-1.0.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libgudev-1.0.so && \
-               mv $(DESTDIR)$(libdir)/libgudev-1.0.so.* $(DESTDIR)$(rootlibdir); \
-       fi
+libgudev-install-hook:
+       libname=libgudev-1.0.so && $(move-to-rootlibdir)
 
-libgudev-uninstall-move-hook:
+libgudev-uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libgudev-1.0.so*
 
-INSTALL_EXEC_HOOKS += libgudev-install-move-hook
-UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
+INSTALL_EXEC_HOOKS += libgudev-install-hook
+UNINSTALL_EXEC_HOOKS += libgudev-uninstall-hook
 endif
 
 EXTRA_DIST += \
@@ -2390,7 +2367,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 +2381,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
@@ -2487,22 +2464,13 @@ pkgconfiglib_DATA += \
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-id128-install-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-id128.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-id128.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-id128.so.* $(DESTDIR)$(rootlibdir); \
-       fi
-
-INSTALL_EXEC_HOOKS += \
-       libsystemd-id128-install-hook
+       libname=libsystemd-id128.so && $(move-to-rootlibdir)
 
 libsystemd-id128-uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
 
-UNINSTALL_EXEC_HOOKS += \
-       libsystemd-id128-uninstall-hook
+INSTALL_EXEC_HOOKS += libsystemd-id128-install-hook
+UNINSTALL_EXEC_HOOKS += libsystemd-id128-uninstall-hook
 
 EXTRA_DIST += \
        src/libsystemd-id128/libsystemd-id128.pc.in \
@@ -2746,22 +2714,13 @@ endif
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-journal-install-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-journal.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-journal.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-journal.so.* $(DESTDIR)$(rootlibdir); \
-       fi
-
-INSTALL_EXEC_HOOKS += \
-       libsystemd-journal-install-hook
+       libname=libsystemd-journal.so && $(move-to-rootlibdir)
 
 libsystemd-journal-uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
 
-UNINSTALL_EXEC_HOOKS += \
-       libsystemd-journal-uninstall-hook
+INSTALL_EXEC_HOOKS += libsystemd-journal-install-hook
+UNINSTALL_EXEC_HOOKS += libsystemd-journal-uninstall-hook
 
 # Update catalog on installation. Do not bother if installing
 # in DESTDIR, since this is likely for packaging purposes.
@@ -3059,6 +3018,25 @@ EXTRA_DIST += \
        units/systemd-readahead-replay.service.in \
        units/systemd-readahead-done.service.in
 
+# ------------------------------------------------------------------------------
+if ENABLE_BOOTCHART
+systemd_bootchart_SOURCES = \
+       src/bootchart/bootchart.c \
+       src/bootchart/bootchart.h \
+       src/bootchart/log.c \
+       src/bootchart/svg.c
+
+MANPAGES += \
+       man/systemd-bootchart.1 \
+       man/bootchart.conf.5
+
+rootlibexec_PROGRAMS += \
+       systemd-bootchart
+
+dist_pkgsysconf_DATA += \
+       src/bootchart/bootchart.conf
+endif
+
 # ------------------------------------------------------------------------------
 if ENABLE_QUOTACHECK
 rootlibexec_PROGRAMS += \
@@ -3327,8 +3305,8 @@ dist_pkgdata_DATA += \
 dist_noinst_SCRIPT = \
        src/locale/generate-kbd-model-map
 
-update-kbd-model-map:
-       src/locale/generate-kbd-model-map > src/locale/kbd-model-map
+update-kbd-model-map: src/locale/generate-kbd-model-map
+       $PYTHON $< > src/locale/kbd-model-map
 
 localectl_SOURCES = \
        src/locale/localectl.c
@@ -3447,6 +3425,8 @@ systemd_logind_SOURCES = \
        src/login/logind-device.h \
        src/login/logind-button.c \
        src/login/logind-button.h \
+       src/login/logind-action.c \
+       src/login/logind-action.h \
        src/login/logind-seat.c \
        src/login/logind-seat.h \
        src/login/logind-session.c \
@@ -3593,24 +3573,36 @@ pamlib_LTLIBRARIES = \
        pam_systemd.la
 endif
 
+if HAVE_MYHOSTNAME
+libnss_myhostname_la_SOURCES = \
+       src/nss-myhostname/nss-myhostname.c \
+       src/nss-myhostname/ifconf.h \
+       src/nss-myhostname/netlink.c
+
+libnss_myhostname_la_CFLAGS = \
+       $(AM_CFLAGS)
+
+libnss_myhostname_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -module \
+       -export-dynamic \
+       -avoid-version \
+       -shared \
+       -shrext .so.2
+
+lib_LTLIBRARIES += \
+       libnss_myhostname.la
+endif
+
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-login-install-hook:
-       if test "$(libdir)" != "$(rootlibdir)"; then \
-               $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
-               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.so) && \
-               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \
-               mv $(DESTDIR)$(libdir)/libsystemd-login.so.* $(DESTDIR)$(rootlibdir); \
-       fi
-
-INSTALL_EXEC_HOOKS += \
-       libsystemd-login-install-hook
+       libname=libsystemd-login.so && $(move-to-rootlibdir)
 
 libsystemd-login-uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
 
-UNINSTALL_EXEC_HOOKS += \
-       libsystemd-login-uninstall-hook
+INSTALL_EXEC_HOOKS += libsystemd-login-install-hook
+UNINSTALL_EXEC_HOOKS += libsystemd-login-uninstall-hook
 
 nodist_systemunit_DATA += \
        units/systemd-logind.service \
@@ -3819,6 +3811,10 @@ SED_PROCESS = \
                -e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
                -e 's,@SYSTEM_SYSVINIT_PATH\@,$(sysvinitdir),g' \
                -e 's,@VARLOGDIR\@,$(varlogdir),g' \
+               -e 's,@RC_LOCAL_SCRIPT_PATH_START\@,$(RC_LOCAL_SCRIPT_PATH_START),g' \
+               -e 's,@RC_LOCAL_SCRIPT_PATH_STOP\@,$(RC_LOCAL_SCRIPT_PATH_STOP),g' \
+               -e 's,@PYTHON\@,$(PYTHON),g' \
+               -e 's,@PYTHON_BINARY\@,$(PYTHON_BINARY),g' \
                < $< > $@
 
 units/%: units/%.in Makefile
@@ -3846,6 +3842,10 @@ src/%.policy.in: src/%.policy.in.in Makefile
        $(SED_PROCESS)
        $(AM_V_GEN)chmod +x $@
 
+src/analyze/systemd-analyze: %: %.in Makefile
+       $(SED_PROCESS)
+       $(AM_V_GEN)chmod +x $@
+
 src/%.c: src/%.gperf
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(GPERF) < $< > $@
@@ -3942,16 +3942,18 @@ docs/sysvinit/README: docs/sysvinit/README.in
 docs/var-log/README: docs/var-log/README.in
        $(SED_PROCESS)
 
-EXTRA_DIST += \
-       docs/sysvinit/README.in \
-       docs/var-log/README.in
-
 CLEANFILES += \
        docs/sysvinit/README \
        docs/var-log/README
 
 endif
 
+EXTRA_DIST += \
+       docs/sysvinit/README.in \
+       docs/var-log/README.in
+
+EXTRA_DIST += \
+       shell-completion/systemd-zsh-completion.zsh
 
 systemd-install-data-hook:
        $(MKDIR_P) -m 0755 \
@@ -4081,36 +4083,6 @@ if HAVE_KMOD
                $(LN_S) ../systemd-modules-load.service systemd-modules-load.service )
 endif
 
-
-if TARGET_FEDORA
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f display-manager.service single.service && \
-               $(LN_S) rescue.service single.service )
-endif
-
-if TARGET_MANDRIVA
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f display-manager.service dm.service single.service && \
-               $(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 && \
-               $(LN_S) rc-local.service local.service )
-endif
-
-if TARGET_MAGEIA
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f display-manager.service )
-endif
-
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
 uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
@@ -4121,7 +4093,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) \
@@ -4132,11 +4105,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/$(sysvrcddir)
+       --with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
+else
+DISTCHECK_CONFIGURE_FLAGS += \
+       --with-sysvinit-path= \
+       --with-sysvrcnd-path=
 endif
 
 if ENABLE_GTK_DOC
@@ -4145,10 +4121,11 @@ DISTCHECK_CONFIGURE_FLAGS += \
 endif
 
 hwdb-update:
-       ( cd hwdb && \
-       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 && \
+       ( cd $(top_srcdir)/hwdb && \
+       wget -N http://www.linux-usb.org/usb.ids \
+               http://pci-ids.ucw.cz/v2.2/pci.ids \
+               http://standards.ieee.org/develop/regauth/oui/oui.txt \
+               http://standards.ieee.org/develop/regauth/iab/iab.txt && \
        ./ids-update.pl )
 
 upload: all distcheck