X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=ca01179e82e0e3b360eabfe9363241ea79594807;hp=a4443fba9af0411d198904a001b10955f476eb01;hb=4ca302b967415107bf7c8f3deb0e3837ac2e2b9f;hpb=67e654f83021a1b3ed55f4b75936d03591bf80c1

diff --git a/Makefile.am b/Makefile.am
index a4443fba9..ca01179e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@
 #  Copyright 2010-2012 Lennart Poettering
 #  Copyright 2010-2012 Kay Sievers
 #  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
 #
 #  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU Lesser General Public License as published by
@@ -34,28 +35,28 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=7
-LIBUDEV_AGE=3
+LIBUDEV_CURRENT=5
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=4
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
-LIBSYSTEMD_LOGIN_CURRENT=8
+LIBSYSTEMD_LOGIN_CURRENT=9
 LIBSYSTEMD_LOGIN_REVISION=1
-LIBSYSTEMD_LOGIN_AGE=8
+LIBSYSTEMD_LOGIN_AGE=9
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_DAEMON_REVISION=10
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=24
+LIBSYSTEMD_ID128_REVISION=26
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=1
+LIBSYSTEMD_JOURNAL_REVISION=3
 LIBSYSTEMD_JOURNAL_AGE=11
 
 # Dirs of external packages
@@ -64,6 +65,7 @@ dbussessionservicedir=@dbussessionservicedir@
 dbussystemservicedir=@dbussystemservicedir@
 dbusinterfacedir=@dbusinterfacedir@
 pamlibdir=@pamlibdir@
+pamconfdir=@pamconfdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
@@ -82,9 +84,9 @@ userunitdir=$(prefix)/lib/systemd/user
 userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
-usergeneratordir=$(prefix)/lib/systemd/user-generators
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
+usergeneratordir=$(prefix)/lib/systemd/user-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemsleepdir=$(rootlibexecdir)/system-sleep
 systemunitdir=$(rootprefix)/lib/systemd/system
@@ -158,7 +160,7 @@ 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)\" \
-	-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
+	-DRANDOM_SEED=\"$(localstatedir)/lib/systemd/random-seed\" \
 	-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
 	-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
 	-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
@@ -318,7 +320,8 @@ rootlibexec_PROGRAMS = \
 	systemd-fsck \
 	systemd-ac-power \
 	systemd-sysctl \
-	systemd-sleep
+	systemd-sleep \
+	systemd-socket-proxyd
 
 systemgenerator_PROGRAMS = \
 	systemd-getty-generator \
@@ -340,6 +343,7 @@ dist_bashcompletion_DATA = \
 	shell-completion/bash/journalctl \
 	shell-completion/bash/systemctl \
 	shell-completion/bash/systemd-analyze \
+	shell-completion/bash/systemd-run \
 	shell-completion/bash/udevadm \
 	shell-completion/bash/kernel-install
 
@@ -347,7 +351,11 @@ dist_zshcompletion_DATA = \
 	shell-completion/zsh/_systemctl \
 	shell-completion/zsh/_journalctl \
 	shell-completion/zsh/_udevadm \
+	shell-completion/zsh/_kernel-install \
 	shell-completion/zsh/_systemd-nspawn \
+	shell-completion/zsh/_systemd-analyze \
+	shell-completion/zsh/_sd_hosts_or_user_at_host \
+	shell-completion/zsh/_systemd-delta \
 	shell-completion/zsh/_systemd
 
 dist_sysctl_DATA = \
@@ -636,9 +644,12 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/list.h \
 	src/shared/macro.h \
 	src/shared/def.h \
+	src/shared/device-nodes.c \
+	src/shared/device-nodes.h \
 	src/shared/sparse-endian.h \
 	src/shared/util.c \
 	src/shared/util.h \
+	src/shared/udev-util.h \
 	src/shared/virt.c \
 	src/shared/virt.h \
 	src/shared/efivars.c \
@@ -675,6 +686,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/exit-status.h \
 	src/shared/utf8.c \
 	src/shared/utf8.h \
+	src/shared/gunicode.c \
+	src/shared/gunicode.h \
 	src/shared/pager.c \
 	src/shared/pager.h \
 	src/shared/ioprio.h \
@@ -709,7 +722,19 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/output-mode.h \
 	src/shared/MurmurHash3.c \
 	src/shared/MurmurHash3.h \
-	src/shared/refcnt.h
+	src/shared/acpi-fpdt.h \
+	src/shared/acpi-fpdt.c \
+	src/shared/boot-timestamps.h \
+	src/shared/boot-timestamps.c \
+	src/shared/refcnt.h \
+	src/shared/mkdir.c \
+	src/shared/mkdir.h \
+	src/shared/smack-util.c \
+	src/shared/smack-util.h \
+	src/shared/apparmor-util.c \
+	src/shared/apparmor-util.h \
+	src/shared/ima-util.c \
+	src/shared/ima-util.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -753,15 +778,12 @@ noinst_LTLIBRARIES += \
 	libsystemd-label.la
 
 libsystemd_label_la_SOURCES = \
-	src/shared/cgroup-label.c \
 	src/shared/socket-label.c \
 	src/shared/label.c \
 	src/shared/label.h \
 	src/shared/selinux-util.c \
 	src/shared/selinux-util.h \
-	src/shared/mkdir.c \
 	src/shared/mkdir-label.c \
-	src/shared/mkdir.h \
 	src/shared/ask-password-api.c \
 	src/shared/ask-password-api.h \
 	src/shared/fileio-label.c \
@@ -784,9 +806,6 @@ libsystemd_logs_la_SOURCES = \
 	src/shared/logs-show.c \
 	src/shared/logs-show.h
 
-libsystemd_logs_la_CFLAGS = \
-	$(AM_CFLAGS)
-
 libsystemd_logs_la_LIBADD = \
 	libsystemd-journal-internal.la \
 	libsystemd-id128-internal.la \
@@ -961,8 +980,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/syscall-list.h \
 	src/core/audit-fd.c \
 	src/core/audit-fd.h \
-	src/core/sync.c \
-	src/core/sync.h
+	src/core/async.c \
+	src/core/async.h
 
 if HAVE_KMOD
 libsystemd_core_la_SOURCES += \
@@ -1021,7 +1040,7 @@ BUILT_SOURCES += \
 
 src/core/syscall-list.txt: Makefile
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9(]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
+	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9(]/ { sub(/__NR_/, "", $$2); if ($$2 !~ /SYSCALL_BASE/) print $$2; }' > $@
 
 src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -1117,6 +1136,8 @@ tests += \
 	test-strxcpyx \
 	test-unit-name \
 	test-unit-file \
+	test-utf8 \
+	test-ellipsize \
 	test-util \
 	test-date \
 	test-sleep \
@@ -1130,7 +1151,8 @@ tests += \
 	test-time \
 	test-hashmap \
 	test-list \
-	test-tables
+	test-tables \
+	test-device-nodes
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1139,6 +1161,15 @@ EXTRA_DIST += \
 	test/sched_rr_ok.service \
 	test/sched_rr_change.service
 
+EXTRA_DIST += \
+	src/test/test-helper.h
+
+test_device_nodes_SOURCES = \
+	src/test/test-device-nodes.c
+
+test_device_nodes_LDADD = \
+	libsystemd-shared.la
+
 test_engine_SOURCES = \
 	src/test/test-engine.c
 
@@ -1187,12 +1218,12 @@ test_hostname_LDADD = \
 
 if ENABLE_EFI
 manual_tests += \
-	test-efivars
+	test-boot-timestamp
 
-test_efivars_SOURCES = \
-	src/test/test-efivars.c
+test_boot_timestamp_SOURCES = \
+	src/test/test-boot-timestamps.c
 
-test_efivars_LDADD = \
+test_boot_timestamp_LDADD = \
 	libsystemd-shared.la
 endif
 
@@ -1216,30 +1247,27 @@ test_unit_file_CFLAGS = \
 test_unit_file_LDADD = \
 	libsystemd-core.la
 
+test_utf8_SOURCES = \
+	src/test/test-utf8.c
+
+test_utf8_LDADD = \
+	libsystemd-shared.la
+
 test_util_SOURCES = \
 	src/test/test-util.c
 
-test_util_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_util_LDADD = \
 	libsystemd-core.la
 
 test_hashmap_SOURCES = \
 	src/test/test-hashmap.c
 
-test_hashmap_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_hashmap_LDADD = \
 	libsystemd-core.la
 
 test_list_SOURCES = \
 	src/test/test-list.c
 
-test_list_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_list_LDADD = \
 	libsystemd-core.la
 
@@ -1258,27 +1286,18 @@ test_tables_LDADD = \
 test_prioq_SOURCES = \
 	src/test/test-prioq.c
 
-test_prioq_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_prioq_LDADD = \
 	libsystemd-core.la
 
 test_fileio_SOURCES = \
 	src/test/test-fileio.c
 
-test_fileio_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_fileio_LDADD = \
 	libsystemd-core.la
 
 test_time_SOURCES = \
 	src/test/test-time.c
 
-test_time_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_time_LDADD = \
 	libsystemd-core.la
 
@@ -1288,6 +1307,12 @@ test_log_SOURCES = \
 test_log_LDADD = \
 	libsystemd-core.la
 
+test_ellipsize_SOURCES = \
+	src/test/test-ellipsize.c
+
+test_ellipsize_LDADD = \
+	libsystemd-core.la
+
 test_date_SOURCES = \
 	src/test/test-date.c
 
@@ -1337,7 +1362,8 @@ test_cgroup_util_SOURCES = \
 
 test_cgroup_util_LDADD = \
 	libsystemd-label.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	libsystemd-daemon.la
 
 test_env_replace_SOURCES = \
 	src/test/test-env-replace.c
@@ -1451,7 +1477,7 @@ systemd_initctl_CFLAGS = \
 systemd_initctl_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
-	libsystemd-dbus.la
+	libsystemd-bus.la
 
 # ------------------------------------------------------------------------------
 systemd_update_utmp_SOURCES = \
@@ -1464,7 +1490,7 @@ systemd_update_utmp_CFLAGS = \
 
 systemd_update_utmp_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-dbus.la \
+	libsystemd-bus.la \
 	$(AUDIT_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -1532,12 +1558,15 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 if ENABLE_TMPFILES
 systemd_tmpfiles_SOURCES = \
-	src/tmpfiles/tmpfiles.c
+	src/tmpfiles/tmpfiles.c \
+	src/shared/specifier.c \
+	src/shared/specifier.h
 
 systemd_tmpfiles_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
-	libsystemd-capability.la
+	libsystemd-capability.la \
+	libsystemd-id128-internal.la
 
 rootbin_PROGRAMS += \
 	systemd-tmpfiles
@@ -1564,6 +1593,9 @@ SYSINIT_TARGET_WANTS += \
 	systemd-tmpfiles-setup-dev.service \
 	systemd-tmpfiles-setup.service
 
+dist_zshcompletion_DATA += \
+	shell-completion/zsh/_systemd-tmpfiles
+
 TIMERS_TARGET_WANTS += \
 	systemd-tmpfiles-clean.timer
 
@@ -1612,7 +1644,7 @@ systemd_fsck_CFLAGS = \
 
 systemd_fsck_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-dbus.la \
+	libsystemd-bus.la \
 	libudev.la
 
 # ------------------------------------------------------------------------------
@@ -1697,6 +1729,26 @@ bin_PROGRAMS += \
 	bootctl
 endif
 
+# ------------------------------------------------------------------------------
+if HAVE_BLKID
+systemgenerator_PROGRAMS +=  \
+	systemd-gpt-auto-generator
+
+systemd_gpt_auto_generator_SOURCES = \
+	src/gpt-auto-generator/gpt-auto-generator.c
+
+systemd_gpt_auto_generator_LDADD = \
+	libsystemd-label.la \
+	libsystemd-shared.la \
+	libsystemd-id128-internal.la \
+	libudev-private.la \
+	$(BLKID_LIBS)
+
+systemd_gpt_auto_generator_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(BLKID_CFLAGS)
+endif
+
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
 	src/rc-local-generator/rc-local-generator.c
@@ -1725,7 +1777,7 @@ systemd_cgroups_agent_CFLAGS = \
 
 systemd_cgroups_agent_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-dbus.la
+	libsystemd-bus.la
 
 # ------------------------------------------------------------------------------
 systemctl_SOURCES = \
@@ -1876,7 +1928,9 @@ EXTRA_DIST += \
 libsystemd_bus_la_SOURCES = \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-bus-protocol.h \
+	src/systemd/sd-bus-vtable.h \
 	src/systemd/sd-memfd.h \
+	src/systemd/sd-event.h \
 	src/libsystemd-bus/sd-bus.c \
 	src/libsystemd-bus/bus-control.c \
 	src/libsystemd-bus/bus-control.h \
@@ -1898,8 +1952,17 @@ libsystemd_bus_la_SOURCES = \
 	src/libsystemd-bus/bus-match.h \
 	src/libsystemd-bus/bus-bloom.c \
 	src/libsystemd-bus/bus-bloom.h \
+	src/libsystemd-bus/bus-introspect.c \
+	src/libsystemd-bus/bus-introspect.h \
+	src/libsystemd-bus/bus-objects.c \
+	src/libsystemd-bus/bus-objects.h \
+	src/libsystemd-bus/bus-convenience.c \
 	src/libsystemd-bus/kdbus.h \
-	src/libsystemd-bus/sd-memfd.c
+	src/libsystemd-bus/sd-memfd.c \
+	src/libsystemd-bus/sd-event.c \
+	src/libsystemd-bus/bus-util.c \
+	src/libsystemd-bus/bus-util.h \
+	src/libsystemd-bus/event-util.h
 
 libsystemd_bus_la_LIBADD =  \
 	libsystemd-id128-internal.la \
@@ -1923,7 +1986,10 @@ tests += \
 	test-bus-kernel-bloom \
 	test-bus-kernel-benchmark \
 	test-bus-memfd \
-	test-bus-zero-copy
+	test-bus-zero-copy \
+	test-bus-introspect \
+	test-bus-objects \
+	test-event
 
 noinst_PROGRAMS += \
 	busctl
@@ -1973,12 +2039,21 @@ test_bus_server_LDADD = \
 	libsystemd-bus.la \
 	libsystemd-id128-internal.la
 
+test_bus_objects_SOURCES = \
+	src/libsystemd-bus/test-bus-objects.c
+
+test_bus_objects_CFLAGS = \
+	$(AM_CFLAGS) \
+	-pthread
+
+test_bus_objects_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-bus.la \
+	libsystemd-id128-internal.la
+
 test_bus_match_SOURCES = \
 	src/libsystemd-bus/test-bus-match.c
 
-test_bus_match_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_bus_match_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-bus.la \
@@ -1987,9 +2062,6 @@ test_bus_match_LDADD = \
 test_bus_kernel_SOURCES = \
 	src/libsystemd-bus/test-bus-kernel.c
 
-test_bus_kernel_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_bus_kernel_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-bus.la \
@@ -1998,9 +2070,6 @@ test_bus_kernel_LDADD = \
 test_bus_kernel_bloom_SOURCES = \
 	src/libsystemd-bus/test-bus-kernel-bloom.c
 
-test_bus_kernel_bloom_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_bus_kernel_bloom_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-bus.la \
@@ -2009,9 +2078,6 @@ test_bus_kernel_bloom_LDADD = \
 test_bus_kernel_benchmark_SOURCES = \
 	src/libsystemd-bus/test-bus-kernel-benchmark.c
 
-test_bus_kernel_benchmark_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_bus_kernel_benchmark_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-bus.la \
@@ -2020,9 +2086,6 @@ test_bus_kernel_benchmark_LDADD = \
 test_bus_memfd_SOURCES = \
 	src/libsystemd-bus/test-bus-memfd.c
 
-test_bus_memfd_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_bus_memfd_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-bus.la
@@ -2030,13 +2093,25 @@ test_bus_memfd_LDADD = \
 test_bus_zero_copy_SOURCES = \
 	src/libsystemd-bus/test-bus-zero-copy.c
 
-test_bus_zero_copy_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_bus_zero_copy_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-bus.la
 
+test_bus_introspect_SOURCES = \
+	src/libsystemd-bus/test-bus-introspect.c
+
+test_bus_introspect_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-bus.la
+
+test_event_SOURCES = \
+	src/libsystemd-bus/test-event.c
+
+test_event_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-bus.la \
+	libsystemd-id128-internal.la
+
 busctl_SOURCES = \
 	src/libsystemd-bus/busctl.c
 
@@ -2083,7 +2158,6 @@ libudev_la_LDFLAGS = \
 
 libudev_la_LIBADD = \
 	libsystemd-shared.la \
-	libsystemd-label.la \
 	libsystemd-daemon-internal.la \
 	libsystemd-id128-internal.la
 
@@ -2289,7 +2363,10 @@ if HAVE_ACL
 libudev_core_la_SOURCES += \
 	src/udev/udev-builtin-uaccess.c \
 	src/login/logind-acl.c \
-	src/login/sd-login.c
+	src/login/sd-login.c \
+	src/systemd/sd-login.h \
+	src/login/login-shared.c \
+	src/login/login-shared.h
 
 libudev_core_la_LIBADD += \
 	libsystemd-acl.la
@@ -2314,6 +2391,7 @@ udevadm_SOURCES = \
 
 udevadm_LDADD = \
 	libudev-core.la \
+	libsystemd-label.la \
 	libsystemd-shared.la
 
 # Update hwdb on installation. Do not bother if installing
@@ -2640,9 +2718,7 @@ libsystemd_id128_la_LDFLAGS = \
 	-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
 
 libsystemd_id128_la_LIBADD = \
-	libsystemd-shared.la \
-	libsystemd-label.la \
-	libsystemd-daemon-internal.la
+	libsystemd-shared.la
 
 libsystemd_id128_internal_la_SOURCES = \
 	$(libsystemd_id128_la_SOURCES)
@@ -2652,7 +2728,8 @@ test_id128_SOURCES = \
 
 test_id128_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-id128-internal.la
+	libsystemd-id128-internal.la \
+	libsystemd-daemon.la
 
 tests += \
 	test-id128
@@ -2712,12 +2789,11 @@ systemd_cat_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-journal-internal.la
 
+journalctl_CFLAGS = $(AM_CFLAGS)
+
 journalctl_SOURCES = \
 	src/journal/journalctl.c
 
-journalctl_CFLAGS = \
-	$(AM_CFLAGS)
-
 journalctl_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-journal-internal.la \
@@ -2789,6 +2865,15 @@ test_journal_stream_LDADD = \
 	libsystemd-journal-internal.la \
 	libsystemd-id128-internal.la
 
+test_journal_init_SOURCES = \
+	src/journal/test-journal-init.c
+
+test_journal_init_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-daemon-internal.la \
+	$(RT_LIBS) \
+	libsystemd-journal.la
+
 test_journal_verify_SOURCES = \
 	src/journal/test-journal-verify.c
 
@@ -2815,6 +2900,10 @@ test_mmap_cache_LDADD = \
 test_catalog_SOURCES = \
 	src/journal/test-catalog.c
 
+test_catalog_CFLAGS = \
+	$(AM_CFLAGS) \
+	-DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
+
 test_catalog_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-label.la \
@@ -2824,6 +2913,7 @@ test_catalog_LDADD = \
 libsystemd_journal_la_SOURCES = \
 	src/journal/sd-journal.c \
 	src/systemd/sd-journal.h \
+	src/systemd/_sd-common.h \
 	src/journal/journal-file.c \
 	src/journal/journal-file.h \
 	src/journal/journal-vacuum.c \
@@ -2853,6 +2943,7 @@ libsystemd_journal_la_LIBADD = \
 	libsystemd-shared.la \
 	libsystemd-label.la \
 	libsystemd-daemon-internal.la \
+	$(RT_LIBS) \
 	libsystemd-id128-internal.la
 
 libsystemd_journal_internal_la_SOURCES = \
@@ -2877,7 +2968,6 @@ libsystemd_journal_internal_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD = \
-	libsystemd-label.la \
 	libsystemd-audit.la \
 	libsystemd-daemon.la \
 	libudev.la \
@@ -2979,6 +3069,7 @@ tests += \
 	test-journal-syslog \
 	test-journal-match \
 	test-journal-stream \
+	test-journal-init \
 	test-journal-verify \
 	test-journal-interleaving \
 	test-mmap-cache \
@@ -2986,7 +3077,8 @@ tests += \
 
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
-	src/systemd/sd-messages.h
+	src/systemd/sd-messages.h \
+	src/systemd/_sd-common.h
 
 lib_LTLIBRARIES += \
 	libsystemd-journal.la
@@ -3075,6 +3167,19 @@ endif
 EXTRA_DIST += \
 	units/systemd-journal-gatewayd.service.in
 
+# ------------------------------------------------------------------------------
+
+systemd_socket_proxyd_SOURCES = \
+	src/socket-proxy/socket-proxyd.c
+
+systemd_socket_proxyd_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-logs.la \
+	libsystemd-journal-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-daemon.la \
+	libsystemd-bus.la
+
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
@@ -3098,7 +3203,9 @@ systemd_coredumpctl_SOURCES = \
 
 systemd_coredumpctl_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-journal.la
+	libsystemd-journal.la \
+	libsystemd-journal-internal.la \
+	libsystemd-id128-internal.la
 
 bin_PROGRAMS += \
 	systemd-coredumpctl
@@ -3274,6 +3381,46 @@ endif
 EXTRA_DIST += \
 	units/systemd-random-seed.service.in
 
+# ------------------------------------------------------------------------------
+if ENABLE_BACKLIGHT
+rootlibexec_PROGRAMS += \
+	systemd-backlight
+
+nodist_systemunit_DATA += \
+	units/systemd-backlight@.service
+
+systemd_backlight_SOURCES = \
+	src/backlight/backlight.c
+
+systemd_backlight_LDADD = \
+	libsystemd-label.la \
+	libsystemd-shared.la \
+	libudev-private.la
+endif
+
+EXTRA_DIST += \
+	units/systemd-backlight@.service.in
+
+# ------------------------------------------------------------------------------
+if ENABLE_RFKILL
+rootlibexec_PROGRAMS += \
+	systemd-rfkill
+
+nodist_systemunit_DATA += \
+	units/systemd-rfkill@.service
+
+systemd_rfkill_SOURCES = \
+	src/rfkill/rfkill.c
+
+systemd_rfkill_LDADD = \
+	libsystemd-label.la \
+	libsystemd-shared.la \
+	libudev-private.la
+endif
+
+EXTRA_DIST += \
+	units/systemd-rfkill@.service.in
+
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
@@ -3315,15 +3462,11 @@ if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
 	src/hostname/hostnamed.c
 
-systemd_hostnamed_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 systemd_hostnamed_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
-	libsystemd-dbus.la
+	libsystemd-bus.la
 
 rootlibexec_PROGRAMS += \
 	systemd-hostnamed
@@ -3464,15 +3607,11 @@ if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
 	src/timedate/timedated.c
 
-systemd_timedated_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 systemd_timedated_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
-	libsystemd-dbus.la
+	libsystemd-bus.la
 
 rootlibexec_PROGRAMS += \
 	systemd-timedated
@@ -3538,9 +3677,6 @@ libnss_myhostname_la_SOURCES = \
 	src/nss-myhostname/ifconf.h \
 	src/nss-myhostname/netlink.c
 
-libnss_myhostname_la_CFLAGS = \
-	$(AM_CFLAGS)
-
 libnss_myhostname_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-module \
@@ -3631,6 +3767,9 @@ dist_dbussystemservice_DATA += \
 dist_dbuspolicy_DATA += \
 	src/machine/org.freedesktop.machine1.conf
 
+dist_zshcompletion_DATA += \
+	shell-completion/zsh/_machinectl
+
 SYSTEM_UNIT_ALIASES += \
 	systemd-machined.service dbus-org.freedesktop.machine1.service
 
@@ -3655,15 +3794,8 @@ systemd_logind_LDADD = \
 	libsystemd-logind-core.la \
 	$(libsystemd_logind_core_la_LIBADD)
 
-if HAVE_ACL
-systemd_logind_SOURCES += \
-	src/login/logind-acl.c
-
-systemd_logind_LDADD += \
-	libsystemd-acl.la
-endif
-
 libsystemd_logind_core_la_SOURCES = \
+	src/login/logind-core.c \
 	src/login/logind-dbus.c \
 	src/login/logind-device.c \
 	src/login/logind-device.h \
@@ -3675,6 +3807,8 @@ libsystemd_logind_core_la_SOURCES = \
 	src/login/logind-seat.h \
 	src/login/logind-session.c \
 	src/login/logind-session.h \
+	src/login/logind-session-device.c \
+	src/login/logind-session-device.h \
 	src/login/logind-user.c \
 	src/login/logind-user.h \
 	src/login/logind-inhibit.c \
@@ -3682,7 +3816,9 @@ libsystemd_logind_core_la_SOURCES = \
 	src/login/logind-session-dbus.c \
 	src/login/logind-seat-dbus.c \
 	src/login/logind-user-dbus.c \
-	src/login/logind-acl.h
+	src/login/logind-acl.h \
+	src/login/login-shared.c \
+	src/login/login-shared.h
 
 libsystemd_logind_core_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -3697,6 +3833,14 @@ libsystemd_logind_core_la_LIBADD = \
 	libsystemd-id128-internal.la \
 	libudev.la
 
+if HAVE_ACL
+libsystemd_logind_core_la_SOURCES += \
+	src/login/logind-acl.c
+
+libsystemd_logind_core_la_LIBADD += \
+	libsystemd-acl.la
+endif
+
 noinst_LTLIBRARIES += \
 	libsystemd-logind-core.la
 
@@ -3754,6 +3898,13 @@ test_login_LDADD = \
 	libsystemd-login-internal.la \
 	libsystemd-shared.la
 
+test_login_shared_SOURCES = \
+	src/login/test-login-shared.c
+
+test_login_shared_LDADD = \
+	libsystemd-login-internal.la \
+	libsystemd-shared.la
+
 test_inhibit_SOURCES = \
 	src/login/test-inhibit.c
 
@@ -3780,10 +3931,14 @@ manual_tests += \
 	test-inhibit
 
 tests += \
-	test-login-tables
+	test-login-tables \
+	test-login-shared
 
 libsystemd_login_la_SOURCES = \
-	src/login/sd-login.c
+	src/login/sd-login.c \
+	src/systemd/sd-login.h \
+	src/login/login-shared.c \
+	src/login/login-shared.h
 
 libsystemd_login_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -3796,7 +3951,8 @@ libsystemd_login_la_LDFLAGS = \
 
 libsystemd_login_la_LIBADD = \
 	libsystemd-shared.la \
-	libsystemd-daemon-internal.la
+	libsystemd-daemon-internal.la \
+	$(RT_LIBS)
 
 libsystemd_login_internal_la_SOURCES = \
 	$(libsystemd_login_la_SOURCES)
@@ -3824,10 +3980,14 @@ pam_systemd_la_LIBADD = \
 	libsystemd-dbus.la \
 	libsystemd-shared.la \
 	libsystemd-daemon-internal.la \
+	$(RT_LIBS) \
 	$(PAM_LIBS)
 
 pamlib_LTLIBRARIES = \
 	pam_systemd.la
+
+dist_pamconf_DATA = \
+	src/login/systemd-user
 endif
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
@@ -4008,7 +4168,8 @@ _reader_la_LIBADD = \
 	libsystemd-journal.la \
 	libsystemd-id128.la \
 	libsystemd-shared.la \
-	libsystemd-daemon-internal.la
+	libsystemd-daemon-internal.la \
+	$(RT_LIBS)
 
 login_la_SOURCES = \
 	src/python-systemd/login.c \
@@ -4031,7 +4192,8 @@ login_la_LIBADD = \
 	libsystemd-journal.la \
 	libsystemd-login.la \
 	libsystemd-shared.la \
-	libsystemd-daemon-internal.la
+	libsystemd-daemon-internal.la \
+	$(RT_LIBS)
 
 dist_pkgpyexec_PYTHON = \
 	src/python-systemd/journal.py \
@@ -4068,6 +4230,11 @@ CLEAN_LOCAL_HOOKS += clean-sphinx
 clean-sphinx:
 	-rm -rf docs/html/python-systemd/
 
+# Remove Python stuff, e.g. to force rebuilding for a different Python version.
+clean-python:
+	-rm -rf src/python-systemd/.libs src/python-systemd/*.l[ao]
+	-rm -f _daemon.la id128.la _journal.la login.la _reader.la
+
 # ------------------------------------------------------------------------------
 substitutions = \
        '|rootlibexecdir=$(rootlibexecdir)|' \
@@ -4088,10 +4255,12 @@ substitutions = \
        '|catalogdir=$(catalogdir)|' \
        '|tmpfilesdir=$(tmpfilesdir)|' \
        '|sysctldir=$(sysctldir)|' \
+       '|systemgeneratordir=$(systemgeneratordir)|' \
+       '|usergeneratordir=$(usergeneratordir)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_URL=$(PACKAGE_URL)|' \
-       '|RANDOM_SEED=$(localstatedir)/lib/random-seed|' \
+       '|RANDOM_SEED=$(localstatedir)/lib/systemd/random-seed|' \
        '|prefix=$(prefix)|' \
        '|exec_prefix=$(exec_prefix)|' \
        '|libdir=$(libdir)|' \
@@ -4374,6 +4543,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
 	--with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
+	--with-pamconfdir=$$dc_install_base/$(pamconfdir) \
 	--with-rootprefix=$$dc_install_base \
 	--disable-split-usr
 
@@ -4425,3 +4595,8 @@ install-tree: all
 	rm -rf $(abs_srcdir)/install-tree
 	$(MAKE) install DESTDIR=$(abs_srcdir)/install-tree
 	tree $(abs_srcdir)/install-tree
+
+# Let's run all tests of the test suite, but under valgrind. Let's
+# exclude the one perl script we have in there
+valgrind-tests: $(TESTS)
+	for f in $(TESTS) ; do [ "$$f" == "$${f/.pl/}" ] && libtool --mode=execute valgrind --leak-check=full --error-exitcode=55 $(builddir)/$$f ; done