X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=f41296b13eeb95f8f95c31e050e7ff9d7b64bd87;hp=67238fa0f4c3a0ae146e16ec0fa7c1548d4a3176;hb=734744fddd783fec7b19215b24c12e95c00c1e67;hpb=955baa81f8239cb338f53c7707d6d2c656c32c33

diff --git a/Makefile.am b/Makefile.am
index 67238fa0f..f41296b13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,9 +38,9 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBELOGIND_CURRENT=15
-LIBELOGIND_REVISION=0
-LIBELOGIND_AGE=15
+LIBELOGIND_CURRENT=18
+LIBELOGIND_REVISION=3
+LIBELOGIND_AGE=18
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -50,6 +50,8 @@ pamconfdir=@pamconfdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
+polkitrulesdir=$(datadir)/polkit-1/rules.d
+polkitpkladir=$(localstatedir)/lib/polkit-1/localauthority/10-vendor.d
 bashcompletiondir=@bashcompletiondir@
 zshcompletiondir=@zshcompletiondir@
 
@@ -76,8 +78,6 @@ EXTRA_DIST =
 BUILT_SOURCES =
 INSTALL_EXEC_HOOKS =
 UNINSTALL_EXEC_HOOKS =
-INSTALL_DATA_HOOKS =
-UNINSTALL_DATA_HOOKS =
 DISTCLEAN_LOCAL_HOOKS =
 CLEAN_LOCAL_HOOKS =
 pkginclude_HEADERS =
@@ -87,6 +87,8 @@ noinst_DATA =
 pkgconfiglib_DATA =
 polkitpolicy_in_files =
 polkitpolicy_files =
+polkitrules_files =
+polkitpkla_files =
 dist_udevrules_DATA =
 nodist_udevrules_DATA =
 dist_pkgsysconf_DATA =
@@ -95,11 +97,18 @@ dist_dbuspolicy_DATA =
 dist_dbussystemservice_DATA =
 check_PROGRAMS =
 check_DATA =
+dist_rootlibexec_DATA =
+rootlib_LTLIBRARIES =
 tests=
 manual_tests =
+TEST_DATA_FILES =
 if ENABLE_TESTS
-noinst_PROGRAMS = $(manual_tests) $(tests)
+noinst_PROGRAMS = $(manual_tests) $(tests) $(unsafe_tests)
 TESTS = $(tests)
+if ENABLE_UNSAFE_TESTS
+TESTS += \
+	$(unsafe_tests)
+endif
 else
 noinst_PROGRAMS =
 TESTS =
@@ -122,14 +131,16 @@ CLEANFILES = $(BUILT_SOURCES) \
 	$(m4_files:.m4=)
 
 .PHONY: $(INSTALL_EXEC_HOOKS) $(UNINSTALL_EXEC_HOOKS) \
-	$(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS) \
 	$(DISTCLEAN_LOCAL_HOOKS) $(CLEAN_LOCAL_HOOKS)
 
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
 	-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-	-DSYSTEMD_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER)\" \
+	-DSYSTEMD_CGROUP_CONTROLLER=\"_$(CGROUP_CONTROLLER)\" \
+	-DSYSTEMD_CGROUP_CONTROLLER_LEGACY=\"name=$(CGROUP_CONTROLLER)\" \
+	-DSYSTEMD_CGROUP_CONTROLLER_HYBRID=\"name=$(CGROUP_CONTROLLER)\" \
 	-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
+	-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/elogind\" \
 	-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
 	-DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \
 	-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
@@ -152,22 +163,17 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/libelogind/sd-bus \
 	-I $(top_srcdir)/src/libelogind/sd-event \
 	-I $(top_srcdir)/src/libelogind/sd-login \
+	-I $(top_srcdir)/src/libelogind/sd-id128 \
+	-I $(top_srcdir)/src/update-utmp \
+	-I $(top_srcdir)/src/sleep \
+	-DABS_SRC_DIR=\"$(abs_top_srcdir)\" \
+	-DABS_BUILD_DIR=\"$(abs_top_builddir)\" \
 	$(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
 AM_LDFLAGS = $(OUR_LDFLAGS)
 
 # ------------------------------------------------------------------------------
-define move-to-rootlibdir
-	if test "$(libdir)" != "$(rootlibdir)"; then \
-		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
-		so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
-		rm -f $(DESTDIR)$(libdir)/$$libname && \
-		$(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
-		mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
-	fi
-endef
-
 install-touch-usr-hook:
 	touch -c $(DESTDIR)/$(prefix)
 
@@ -198,6 +204,10 @@ AM_V_RM_0 = @echo "  RM      " $@;
 
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS =
+rootlibexec_PROGRAMS = \
+	elogind \
+	elogind-cgroups-agent
+
 pkglibexec_PROGRAMS =
 
 dist_doc_DATA = \
@@ -342,6 +352,8 @@ libbasic_la_SOURCES = \
 	src/basic/escape.h \
 	src/basic/path-util.c \
 	src/basic/path-util.h \
+	src/basic/parse-printf-format.c \
+	src/basic/parse-printf-format.h \
 	src/basic/time-util.c \
 	src/basic/time-util.h \
 	src/basic/locale-util.c \
@@ -363,10 +375,14 @@ libbasic_la_SOURCES = \
 	src/basic/prioq.h \
 	src/basic/strv.c \
 	src/basic/strv.h \
+	src/basic/env-util.c \
+	src/basic/env-util.h \
 	src/basic/log.c \
 	src/basic/log.h \
 	src/basic/bus-label.c \
 	src/basic/bus-label.h \
+	src/basic/exec-util.c \
+	src/basic/exec-util.h \
 	src/basic/virt.c \
 	src/basic/virt.h \
 	src/basic/smack-util.c \
@@ -411,7 +427,10 @@ libbasic_la_SOURCES = \
 	src/basic/copy.c \
 	src/basic/copy.h \
 	src/basic/alloc-util.h \
-	src/basic/alloc-util.c
+	src/basic/alloc-util.c \
+	src/basic/format-util.h \
+	src/basic/khash.h \
+	src/basic/khash.c
 
 nodist_libbasic_la_SOURCES = \
 	src/basic/errno-from-name.h \
@@ -437,6 +456,8 @@ noinst_LTLIBRARIES += \
 	libshared.la
 
 libshared_la_SOURCES = \
+	src/shared/udev-util.h \
+	src/shared/udev-util.c \
 	src/shared/bus-util.c \
 	src/shared/bus-util.h \
 	src/shared/clean-ipc.c \
@@ -447,10 +468,14 @@ libshared_la_SOURCES = \
 	src/shared/musl_missing.c \
 	src/shared/pager.c \
 	src/shared/pager.h \
-	src/shared/parse-printf-format.c \
-	src/shared/parse-printf-format.h \
+	src/shared/sleep-config.c \
+	src/shared/sleep-config.h \
 	src/shared/spawn-polkit-agent.c \
-	src/shared/spawn-polkit-agent.h
+	src/shared/spawn-polkit-agent.h \
+	src/shared/tests.h \
+	src/shared/tests.c \
+	src/shared/nsflags.h \
+	src/shared/nsflags.c
 
 if HAVE_ACL
 libshared_la_SOURCES += \
@@ -464,9 +489,43 @@ libshared_la_CFLAGS = \
 
 libshared_la_LIBADD = \
 	libelogind-internal.la \
+	libbasic.la \
 	$(UDEV_LIBS) \
 	$(ACL_LIBS)
 
+noinst_LTLIBRARIES += \
+	libelogind-shared.la
+
+libelogind_shared_la_SOURCES = \
+	$(libbasic_la_SOURCES) \
+	$(libshared_la_SOURCES) \
+	$(libelogind_internal_la_SOURCES)
+
+libelogind_shared_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(libbasic_la_CFLAGS) \
+	$(libshared_la_CFLAGS) \
+	$(libelogind_internal_la_CFLAGS) \
+	$(libelogind_journal_internal_la_CFLAGS) \
+	$(libudev_internal_la_CFLAGS) \
+	$(ACL_CFLAGS) \
+	$(LIBIDN_CFLAGS) \
+	$(SECCOMP_CFLAGS) \
+	-fvisibility=default
+
+# We can't use libshared_la_LIBADD here because it would
+# pull in libelogind*-internal.la
+libelogind_shared_la_LIBADD = \
+	$(libbasic_la_LIBADD) \
+	$(libelogind_internal_la_LIBADD) \
+	$(UDEV_LIBS) \
+	$(ACL_LIBS) \
+	$(LIBIDN_LIBS) \
+	$(SECCOMP_LIBS)
+
+libelogind_shared_la_LDFLAGS = \
+	$(AM_LDFLAGS)
+ # -----------------------------------------------------------------------------
 gperf_txt_sources = \
 	src/basic/errno-list.txt
 
@@ -505,6 +564,334 @@ src/basic/errno-to-name.h: src/basic/errno-list.txt
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
 
+# ------------------------------------------------------------------------------
+
+manual_tests += \
+	test-cgroup
+
+unsafe_tests = \
+	test-ipcrm
+
+tests += \
+	test-log \
+	test-path-util \
+	test-siphash24 \
+	test-utf8 \
+	test-ellipsize \
+	test-util \
+	test-exec-util \
+	test-hexdecoct \
+	test-escape \
+	test-alloc-util \
+	test-proc-cmdline \
+	test-io-util \
+	test-fs-util \
+	test-stat-util \
+	test-fd-util \
+	test-string-util \
+	test-extract-word \
+	test-parse-util \
+	test-user-util \
+	test-process-util \
+	test-strip-tab-ansi \
+	test-prioq \
+	test-hashmap \
+	test-set \
+	test-list \
+	test-unaligned \
+	test-conf-files \
+	test-conf-parser \
+	test-locale-util \
+	test-copy \
+	test-verbs \
+	test-signal-util \
+	test-selinux \
+	test-sizeof
+
+TEST_DATA_FILES += \
+	test/bus-policy/hello.conf \
+	test/bus-policy/methods.conf \
+	test/bus-policy/ownerships.conf \
+	test/bus-policy/signals.conf \
+	test/bus-policy/check-own-rules.conf \
+	test/bus-policy/many-rules.conf \
+	test/bus-policy/test.conf
+
+
+EXTRA_DIST += \
+	src/test/test-helper.h
+
+test_utf8_SOURCES = \
+	src/test/test-utf8.c
+
+test_utf8_LDADD = \
+	libelogind-shared.la
+
+test_locale_util_SOURCES = \
+	src/test/test-locale-util.c
+
+test_locale_util_LDADD = \
+	libelogind-shared.la
+
+test_copy_SOURCES = \
+	src/test/test-copy.c
+
+# Link statically to ensure file is large
+test_copy_LDADD = \
+	libshared.la
+
+test_util_SOURCES = \
+	src/test/test-util.c
+
+test_util_LDADD = \
+	libelogind-shared.la
+
+test_exec_util_SOURCES = \
+	src/test/test-exec-util.c
+
+test_exec_util_LDADD = \
+	libelogind-shared.la
+
+test_hexdecoct_SOURCES = \
+	src/test/test-hexdecoct.c
+
+test_hexdecoct_LDADD = \
+	libelogind-shared.la
+
+test_alloc_util_SOURCES = \
+	src/test/test-alloc-util.c
+
+test_alloc_util_LDADD = \
+	libelogind-shared.la
+
+test_io_util_SOURCES = \
+	src/test/test-io-util.c
+
+test_io_util_LDADD = \
+	libelogind-shared.la
+
+test_fs_util_SOURCES = \
+	src/test/test-fs-util.c
+
+test_fs_util_LDADD = \
+	libelogind-shared.la
+
+test_proc_cmdline_SOURCES = \
+	src/test/test-proc-cmdline.c
+
+test_proc_cmdline_LDADD = \
+	libelogind-shared.la
+
+test_fd_util_SOURCES = \
+	src/test/test-fd-util.c
+
+test_fd_util_LDADD = \
+	libelogind-shared.la
+
+test_stat_util_SOURCES = \
+	src/test/test-stat-util.c
+
+test_stat_util_LDADD = \
+	libelogind-shared.la
+
+test_escape_SOURCES = \
+	src/test/test-escape.c
+
+test_escape_LDADD = \
+	libelogind-shared.la
+
+test_string_util_SOURCES = \
+	src/test/test-string-util.c
+
+test_string_util_LDADD = \
+	libelogind-shared.la
+
+test_extract_word_SOURCES = \
+	src/test/test-extract-word.c
+
+test_extract_word_LDADD = \
+	libelogind-shared.la
+
+test_parse_util_SOURCES = \
+	src/test/test-parse-util.c
+
+test_parse_util_LDADD = \
+	libelogind-shared.la
+
+test_user_util_SOURCES = \
+	src/test/test-user-util.c
+
+test_user_util_LDADD = \
+	libelogind-shared.la
+
+test_process_util_SOURCES = \
+	src/test/test-process-util.c
+
+test_process_util_LDADD = \
+	libelogind-shared.la
+
+test_verbs_SOURCES = \
+	src/test/test-verbs.c
+
+test_verbs_LDADD = \
+	libelogind-shared.la
+
+test_signal_util_SOURCES = \
+	src/test/test-signal-util.c
+
+test_signal_util_LDADD = \
+	libelogind-shared.la
+
+test_selinux_SOURCES = \
+	src/test/test-selinux.c
+
+test_selinux_LDADD = \
+	libelogind-shared.la
+
+test_sizeof_SOURCES = \
+	src/test/test-sizeof.c
+
+test_sizeof_LDADD = \
+	libelogind-shared.la
+
+BUILT_SOURCES += \
+	src/test/test-hashmap-ordered.c
+
+src/test/test-hashmap-ordered.c: src/test/test-hashmap-plain.c
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)$(AWK) 'BEGIN { print "/* GENERATED FILE */\n#define ORDERED" } \
+	                   { if (!match($$0, "^#include"))          \
+	                         gsub(/hashmap/, "ordered_hashmap"); \
+	                     gsub(/HASHMAP/, "ORDERED_HASHMAP");     \
+	                     gsub(/Hashmap/, "OrderedHashmap");      \
+	                     print }' <$< >$@
+
+nodist_test_hashmap_SOURCES = \
+	src/test/test-hashmap-ordered.c
+
+test_hashmap_SOURCES = \
+	src/test/test-hashmap.c \
+	src/test/test-hashmap-plain.c
+
+test_hashmap_LDADD = \
+	libelogind-shared.la
+
+test_set_SOURCES = \
+	src/test/test-set.c
+
+test_set_LDADD = \
+	libelogind-shared.la
+
+test_list_SOURCES = \
+	src/test/test-list.c
+
+test_list_LDADD = \
+	libelogind-shared.la
+
+test_unaligned_LDADD = \
+	libelogind-shared.la
+
+test_unaligned_SOURCES = \
+	src/test/test-unaligned.c
+
+test_prioq_SOURCES = \
+	src/test/test-prioq.c
+
+test_prioq_LDADD = \
+	libelogind-shared.la
+
+test_log_SOURCES = \
+	src/test/test-log.c
+
+test_log_LDADD = \
+	libelogind-shared.la
+
+test_ipcrm_SOURCES = \
+	src/test/test-ipcrm.c
+
+test_ipcrm_LDADD = \
+	libelogind-shared.la
+
+test_ellipsize_SOURCES = \
+	src/test/test-ellipsize.c
+
+test_ellipsize_LDADD = \
+	libelogind-shared.la
+
+test_strip_tab_ansi_SOURCES = \
+	src/test/test-strip-tab-ansi.c
+
+test_strip_tab_ansi_LDADD = \
+	libelogind-shared.la
+
+test_cgroup_SOURCES = \
+	src/test/test-cgroup.c
+
+test_cgroup_LDADD = \
+	libelogind-shared.la
+
+test_path_util_SOURCES = \
+	src/test/test-path-util.c
+
+test_path_util_LDADD = \
+	libelogind-shared.la
+
+test_siphash24_SOURCES = \
+	src/test/test-siphash24.c
+
+test_siphash24_LDADD = \
+	libelogind-shared.la
+
+test_conf_files_SOURCES = \
+	src/test/test-conf-files.c
+
+test_conf_files_LDADD = \
+	libelogind-shared.la
+
+test_conf_parser_SOURCES = \
+	src/test/test-conf-parser.c
+
+test_conf_parser_LDADD = \
+	libelogind-shared.la
+
+# ------------------------------------------------------------------------------
+## .PHONY so it always rebuilds it
+.PHONY: coverage lcov-run lcov-report coverage-sync
+
+# run lcov from scratch, always
+coverage: all
+	$(MAKE) lcov-run
+	$(MAKE) lcov-report
+
+coverage_dir = coverage
+coverage_opts = --base-directory $(srcdir) --directory $(builddir) --rc 'geninfo_adjust_src_path=$(abspath $(srcdir))=>$(abspath $(builddir))'
+
+if ENABLE_COVERAGE
+# reset run coverage tests
+lcov-run:
+	@rm -rf $(coverage_dir)
+	lcov $(coverage_opts) --zerocounters
+	-$(MAKE) check
+
+# generate report based on current coverage data
+lcov-report:
+	$(MKDIR_P) $(coverage_dir)
+	lcov $(coverage_opts) --compat-libtool --capture --no-external \
+		| sed 's|$(abspath $(builddir))|$(abspath $(srcdir))|' > $(coverage_dir)/.lcov.info
+	lcov --remove $(coverage_dir)/.lcov.info --output-file $(coverage_dir)/.lcov-clean.info 'test-*'
+	genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov-clean.info
+	@echo "Coverage report generated in $(abs_builddir)/$(coverage_dir)/index.html"
+
+# lcov doesn't work properly with vpath builds, make sure that bad
+# output is not uploaded by mistake.
+coverage-sync: coverage
+	test "$(builddir)" = "$(srcdir)"
+	rsync -rlv --delete --omit-dir-times coverage/ $(www_target)/coverage
+
+else
+lcov-run lcov-report:
+	echo "Need to reconfigure with --enable-coverage"
+endif
 
 # ------------------------------------------------------------------------------
 
@@ -522,7 +909,7 @@ elogind_cgroups_agent_SOURCES = \
        src/cgroups-agent/cgroups-agent.c
 
 elogind_cgroups_agent_LDADD = \
-       libshared.la
+       libelogind-shared.la
 
 # ------------------------------------------------------------------------------
 libelogind_internal_la_SOURCES = \
@@ -575,13 +962,11 @@ libelogind_internal_la_SOURCES = \
 	src/libelogind/sd-bus/bus-protocol.h \
 	src/libelogind/sd-event/sd-event.c \
 	src/libelogind/sd-id128/sd-id128.c \
+	src/libelogind/sd-id128/id128-util.h \
+	src/libelogind/sd-id128/id128-util.c \
 	src/libelogind/sd-daemon/sd-daemon.c \
 	src/libelogind/sd-login/sd-login.c
 
-libelogind_internal_la_LIBADD = \
-	libbasic.la \
-	-lresolv
-
 noinst_LTLIBRARIES += \
 	libelogind-internal.la
 
@@ -590,14 +975,7 @@ EXTRA_DIST += \
 	src/libelogind/sd-bus/DIFFERENCES \
 	src/libelogind/sd-bus/GVARIANT-SERIALIZATION
 
-libelogind_la_SOURCES = \
-	$(libelogind_internal_la_SOURCES)
-
-nodist_libelogind_la_SOURCES = \
-	$(nodist_libelogind_internal_la_SOURCES)
-
-libelogind_la_CFLAGS = \
-	$(libelogind_internal_la_CFLAGS)
+libelogind_la_SOURCES =
 
 libelogind_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
@@ -605,16 +983,8 @@ libelogind_la_LDFLAGS = \
 	-Wl,--version-script=$(top_srcdir)/src/libelogind/libelogind.sym
 
 libelogind_la_LIBADD = \
-	$(libelogind_internal_la_LIBADD)
-
-libelogind-install-hook:
-	libname=libelogind.so && $(move-to-rootlibdir)
-
-libelogind-uninstall-hook:
-	rm -f $(DESTDIR)$(rootlibdir)/libelogind.so*
-
-INSTALL_EXEC_HOOKS += libelogind-install-hook
-UNINSTALL_EXEC_HOOKS += libelogind-uninstall-hook
+	libelogind-internal.la \
+	libbasic.la
 
 pkgconfiglib_DATA += \
 	src/libelogind/libelogind.pc
@@ -639,9 +1009,74 @@ header-uninstall-hook:
 INSTALL_EXEC_HOOKS += header-install-hook
 UNINSTALL_EXEC_HOOKS += header-uninstall-hook
 
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
 	libelogind.la
 
+tests += \
+	test-bus-signature \
+	test-bus-server \
+	test-bus-match \
+	test-bus-introspect \
+	test-bus-error \
+	test-event
+
+test_bus_signature_SOURCES = \
+	src/libelogind/sd-bus/test-bus-signature.c
+
+test_bus_signature_LDADD = \
+	libelogind-shared.la
+
+test_bus_server_SOURCES = \
+	src/libelogind/sd-bus/test-bus-server.c
+
+test_bus_server_LDADD = \
+	libelogind-shared.la
+
+test_bus_error_SOURCES = \
+	src/libelogind/sd-bus/test-bus-error.c
+
+# Link statically because this test uses BUS_ERROR_MAP_ELF_REGISTER
+test_bus_error_LDADD = \
+	libshared.la
+
+test_bus_match_SOURCES = \
+	src/libelogind/sd-bus/test-bus-match.c
+
+test_bus_match_LDADD = \
+	libelogind-shared.la
+
+test_bus_introspect_SOURCES = \
+	src/libelogind/sd-bus/test-bus-introspect.c
+
+test_bus_introspect_LDADD = \
+	libelogind-shared.la
+
+test_event_SOURCES = \
+	src/libelogind/sd-event/test-event.c
+
+test_event_LDADD = \
+	libelogind-shared.la
+
+# ------------------------------------------------------------------------------
+test_id128_SOURCES = \
+	src/test/test-id128.c
+
+test_id128_LDADD = \
+	libelogind-shared.la
+
+tests += \
+	test-id128
+
+# ------------------------------------------------------------------------------
+test_hash_SOURCES = \
+	src/test/test-hash.c
+
+test_hash_LDADD = \
+	libelogind-shared.la
+
+tests += \
+	test-hash
+
 # ------------------------------------------------------------------------------
 elogind_SOURCES = \
 	src/login/logind.c \
@@ -654,6 +1089,14 @@ elogind_LDADD = \
 	libelogind-core.la
 
 libelogind_core_la_SOURCES = \
+	src/core/cgroup.h \
+	src/core/cgroup.c \
+	src/core/mount-setup.h \
+	src/core/mount-setup.c \
+        src/login/elogind.c \
+        src/login/elogind.h \
+	src/login/elogind-dbus.c \
+	src/login/elogind-dbus.h \
 	src/login/logind-core.c \
 	src/login/logind-device.c \
 	src/login/logind-device.h \
@@ -667,8 +1110,6 @@ libelogind_core_la_SOURCES = \
 	src/login/logind-session.h \
 	src/login/logind-session-device.c \
 	src/login/logind-session-device.h \
-	src/login/logind-sleep.c \
-	src/login/logind-sleep.h \
 	src/login/logind-user.c \
 	src/login/logind-user.h \
 	src/login/logind-inhibit.c \
@@ -677,14 +1118,19 @@ libelogind_core_la_SOURCES = \
 	src/login/logind-session-dbus.c \
 	src/login/logind-seat-dbus.c \
 	src/login/logind-user-dbus.c \
+	src/login/logind-utmp.c \
 	src/login/logind-acl.h \
-	src/core/cgroup.h \
-	src/core/cgroup.c \
-	src/core/mount-setup.h \
-	src/core/mount-setup.c
+	src/sleep/sleep.c \
+	src/sleep/sleep.h
+
+if HAVE_UTMP
+libelogind_core_la_SOURCES += \
+	src/shared/utmp-wtmp.c \
+	src/update-utmp/update-utmp.c
+endif
 
 libelogind_core_la_LIBADD = \
-	libshared.la
+	libelogind-shared.la
 
 if HAVE_ACL
 libelogind_core_la_SOURCES += \
@@ -698,12 +1144,14 @@ pkglibexec_PROGRAMS += \
 	elogind
 
 loginctl_SOURCES = \
+	src/login/eloginctl.c \
+	src/login/eloginctl.h \
 	src/login/loginctl.c \
 	src/login/sysfs-show.h \
 	src/login/sysfs-show.c
 
 loginctl_LDADD = \
-	libshared.la
+	libelogind-shared.la
 
 rootbin_PROGRAMS += \
 	loginctl
@@ -719,7 +1167,7 @@ elogind_inhibit_SOURCES = \
 	src/login/inhibit.c
 
 elogind_inhibit_LDADD = \
-	libshared.la
+	libelogind-shared.la
 
 rootbin_PROGRAMS += \
 	elogind-inhibit
@@ -728,19 +1176,19 @@ test_login_SOURCES = \
 	src/libelogind/sd-login/test-login.c
 
 test_login_LDADD = \
-	libshared.la
+	libelogind-shared.la
 
 test_login_shared_SOURCES = \
 	src/login/test-login-shared.c
 
 test_login_shared_LDADD = \
-	libshared.la
+	libelogind-shared.la
 
 test_inhibit_SOURCES = \
 	src/login/test-inhibit.c
 
 test_inhibit_LDADD = \
-	libshared.la
+	libelogind-shared.la
 
 test_login_tables_SOURCES = \
 	src/login/test-login-tables.c
@@ -780,8 +1228,10 @@ pam_elogind_la_LIBADD = \
 pamlib_LTLIBRARIES = \
 	pam_elogind.la
 
+if ENABLE_PAM_CONFIG
 dist_pamconf_DATA = \
 	src/login/elogind-user
+endif
 
 EXTRA_DIST += \
 	src/login/elogind-user.m4
@@ -820,6 +1270,7 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 substitutions = \
+       '|rootlibdir=$(rootlibdir)|' \
        '|rootlibexecdir=$(rootlibexecdir)|' \
        '|rootbindir=$(rootbindir)|' \
        '|bindir=$(bindir)|' \
@@ -846,7 +1297,8 @@ substitutions = \
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \
-		< $< > $@
+                -e '/^\#\# /d' \
+                < $< > $@
 
 man/%: man/%.in
 	$(SED_PROCESS)
@@ -898,6 +1350,8 @@ units/user/%: units/user/%.m4
 if ENABLE_POLKIT
 nodist_polkitpolicy_DATA = \
 	$(polkitpolicy_files)
+polkitrules_DATA = $(polkitrules_files)
+polkitpkla_DATA = $(polkitpkla_files)
 endif
 
 EXTRA_DIST += \
@@ -960,9 +1414,7 @@ EXTRA_DIST += \
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
-uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
-
-install-data-hook: $(INSTALL_DATA_HOOKS)
+uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 
 distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
@@ -1053,21 +1505,21 @@ install-tree: all
 	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
+# exclude perl/python/shell scripts we have in there
 .PHONY: valgrind-tests
 valgrind-tests: $(TESTS)
-	$(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
-		if file $$f | grep -q shell; then \
+	$(AM_V_GEN)for f in $(filter-out %.pl %.py, $^); do \
+		if $(LIBTOOL) --mode=execute file $$f | grep -q shell; then \
 		echo -e "$${x}Skipping non-binary $$f"; else \
 		echo -e "$${x}Running $$f"; \
-		libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
+		$(AM_TESTS_ENVIRONMENT) $(LIBTOOL) --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
 		x="\n\n"; \
 	done
 
 exported-%: %
 	$(AM_V_GEN)$(NM) -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@
 
-exported: $(addprefix exported-, $(lib_LTLIBRARIES))
+exported: $(addprefix exported-, $(rootlib_LTLIBRARIES))
 	$(AM_V_GEN)cat $^ > $@
 
 .PHONY: check-api-docs
@@ -1135,16 +1587,49 @@ BUILT_SOURCES += \
 tests += \
 	test-libelogind-sym
 
-.PHONY: cppcheck
+.PHONY: install-tests
+install-tests: $(tests) $(TEST_DATA_FILES)
+	for f in $(tests); do \
+	    if [ -x $(top_builddir)/.libs/$$f ]; then \
+		install -D -m 755 $(top_builddir)/.libs/$$f $(DESTDIR)/$(testsdir)/$$f; \
+	    else \
+		install -D -m 755 $(top_builddir)/$$f $(DESTDIR)/$(testsdir)/$$f; \
+	    fi; \
+	done
+	for f in $(TEST_DATA_FILES); do \
+	    install -D -m 644 $(top_srcdir)/$$f $(DESTDIR)/$(testsdir)/testdata/$${f#test/}; \
+	done
+
+.PHONY: cccc cppcheck
+cccc: all
+	cccc --outdir=$(top_builddir)/cccc \
+	`find $(top_srcdir)/src/ -name '*.h' -or -name '*.c'`
+
 cppcheck:
-	cppcheck --enable=all -q $(top_srcdir)
+	cppcheck --enable=all -q \
+	-I $(top_srcdir)/src \
+	-I $(top_builddir)/src/basic \
+	-I $(top_srcdir)/src/basic \
+	-I $(top_srcdir)/src/core \
+	-I $(top_srcdir)/src/shared \
+	-I $(top_builddir)/src/shared \
+	-I $(top_srcdir)/src/login \
+	-I $(top_srcdir)/src/systemd \
+	-I $(top_srcdir)/src/libelogind/sd-bus \
+	-I $(top_srcdir)/src/libelogind/sd-event \
+	-I $(top_srcdir)/src/libelogind/sd-login \
+	-I $(top_srcdir)/src/libelogind/sd-id128 \
+	-I $(top_srcdir)/src/update-utmp \
+	-I $(top_srcdir)/src/sleep \
+	--force \
+	$(top_srcdir)
 
 # Used to extract compile flags for YCM.
 print-%:
 	@echo $($*)
 
 git-contrib:
-	@git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u
+	@git shortlog -s `git describe --abbrev=0`.. | cut -c8- | sed 's/ / /g' | awk '{ print $$0 "," }' | sort -u
 
 EXTRA_DIST += \
         tools/gdb-sd_dump_hashmaps.py