X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=db68522bf61fd11f0349c976218b090806270faf;hp=bafd4734cca150b219434890af8069215973c143;hb=d2a30975827b3447ca0fd5a2c06ec1ff15ce7f0f;hpb=5fe25affc01fb003a3a66937458a25640a6075ce

diff --git a/Makefile.am b/Makefile.am
index bafd4734c..db68522bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-#  -*- Mode: makefile; indent-tabs-mode: t -*- */
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
 #
 #  This file is part of systemd.
 #
@@ -28,27 +28,27 @@ 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=10
+LIBSYSTEMD_LOGIN_REVISION=11
 LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=6
+LIBSYSTEMD_DAEMON_REVISION=7
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=16
+LIBSYSTEMD_ID128_REVISION=17
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=7
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=1
 LIBSYSTEMD_JOURNAL_AGE=7
 
 # Dirs of external packages
@@ -63,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
@@ -142,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)\" \
@@ -168,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 = \
@@ -225,9 +195,6 @@ bin_PROGRAMS = \
 	systemd-detect-virt \
 	systemd-delta
 
-dist_bin_SCRIPTS = \
-	src/analyze/systemd-analyze
-
 rootlibexec_PROGRAMS = \
 	systemd \
 	systemd-cgroups-agent \
@@ -253,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
 
@@ -283,7 +259,6 @@ dist_systemunit_DATA = \
 	units/network.target \
 	units/nss-lookup.target \
 	units/nss-user-lookup.target \
-	units/mail-transfer-agent.target \
 	units/hibernate.target \
 	units/hybrid-sleep.target \
 	units/poweroff.target \
@@ -316,7 +291,6 @@ dist_systemunit_DATA = \
 	units/quotaon.service \
 	units/systemd-ask-password-wall.path \
 	units/systemd-ask-password-console.path \
-	units/syslog.target \
 	units/systemd-udevd-control.socket \
 	units/systemd-udevd-kernel.socket \
 	units/system-update.target
@@ -401,47 +375,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 \
@@ -635,6 +583,11 @@ 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
@@ -727,23 +680,12 @@ CLEANFILES += \
 	${XML_FILES:.xml=.html}
 
 if HAVE_PYTHON
-noinst_DATA += \
-	man/index.html
-
-CLEANFILES += \
-	man/index.html
-
-man/index.html: make-man-index.py $(XML_FILES)
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(PYTHON) $^ > $@
-
 MANPAGES += \
-	man/systemd.directives.5
-
-EXTRA_DIST += \
-	man/index.html
+	man/systemd.index.7 \
+	man/systemd.directives.7
 
 XML_DIRECTIVE_FILES = \
+	man/systemd.xml \
 	man/systemd.unit.xml \
 	man/systemd.service.xml \
 	man/systemd.socket.xml \
@@ -759,13 +701,19 @@ XML_DIRECTIVE_FILES = \
 	man/systemd.device.xml \
 	man/systemd.conf.xml \
 	man/systemd.journal-fields.xml \
-	man/systemd.time.xml
+	man/systemd.time.xml \
+	man/bootchart.conf.xml
+
+man/systemd.index.xml: make-man-index.py $(filter-out man/systemd.index.xml,$(XML_FILES))
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)$(PYTHON) $^ > $@
 
 man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(PYTHON) $^ > $@
 
 EXTRA_DIST += \
+	man/systemd.index.xml \
 	man/systemd.directives.xml
 
 endif
@@ -806,10 +754,14 @@ libsystemd_shared_la_SOURCES = \
 	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 \
@@ -850,7 +802,10 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/time-dst.c \
 	src/shared/time-dst.h \
 	src/shared/calendarspec.c \
-	src/shared/calendarspec.h
+	src/shared/calendarspec.h \
+	src/shared/output-mode.h
+
+libsystemd_shared_la_LIBADD = libsystemd-daemon.la
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -1062,8 +1017,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 \
@@ -1115,6 +1068,7 @@ libsystemd_core_la_LIBADD = \
 	libsystemd-dbus.la \
 	libsystemd-audit.la \
 	libsystemd-id128-internal.la \
+	libsystemd-daemon.la \
 	libudev.la \
 	$(LIBWRAP_LIBS) \
 	$(PAM_LIBS) \
@@ -1236,7 +1190,8 @@ noinst_PROGRAMS += \
 	test-sleep \
 	test-replace-var \
 	test-sched-prio \
-	test-calendarspec
+	test-calendarspec \
+	test-strip-tab-ansi
 
 TESTS += \
 	test-job-type \
@@ -1248,7 +1203,8 @@ TESTS += \
 	test-sleep \
 	test-replace-var \
 	test-sched-prio \
-	test-calendarspec
+	test-calendarspec \
+	test-strip-tab-ansi
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1345,6 +1301,12 @@ test_calendarspec_SOURCES = \
 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
 
@@ -1710,22 +1672,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
@@ -1822,20 +1775,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 += \
@@ -1887,6 +1834,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
@@ -1899,6 +1847,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
 
@@ -2297,20 +2246,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 += \
@@ -2515,22 +2458,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 \
@@ -2774,22 +2708,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.
@@ -3087,6 +3012,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 += \
@@ -3355,8 +3299,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
@@ -3475,6 +3419,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 \
@@ -3621,24 +3567,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 \
@@ -3726,6 +3684,7 @@ MANPAGES_ALIAS += \
 	man/sd_session_get_type.3 \
 	man/sd_session_get_class.3 \
 	man/sd_session_get_display.3 \
+	man/sd_session_get_tty.3 \
 	man/sd_pid_get_owner_uid.3 \
 	man/sd_pid_get_unit.3 \
 	man/sd_uid_is_on_seat.3 \
@@ -3750,6 +3709,7 @@ man/sd_session_get_state.3: man/sd_session_is_active.3
 man/sd_session_get_type.3: man/sd_session_is_active.3
 man/sd_session_get_class.3: man/sd_session_is_active.3
 man/sd_session_get_display.3: man/sd_session_is_active.3
+man/sd_session_get_tty.3: man/sd_session_is_active.3
 man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
 man/sd_pid_get_unit.3: man/sd_pid_get_session.3
 man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
@@ -3847,6 +3807,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
@@ -3874,6 +3838,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) < $< > $@
@@ -3970,16 +3938,16 @@ 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
 
@@ -4111,30 +4079,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_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)
@@ -4157,11 +4101,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
@@ -4170,11 +4117,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 && \
-	wget -N http://standards.ieee.org/develop/regauth/iab/iab.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