chiark / gitweb /
build-sys: configure --with-python when running distcheck
[elogind.git] / Makefile.am
index e1c86aa737bfe211ff4ade6817872d8d535cb870..28acc64685fda0dceb3a98900d4a28f9388b7ff1 100644 (file)
@@ -36,13 +36,19 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBUDEV_CURRENT=5
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=4
 
 LIBGUDEV_CURRENT=2
 LIBGUDEV_REVISION=0
 LIBGUDEV_AGE=2
 
+LIBSYSTEMD_CURRENT=3
+LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_AGE=3
+
+# The following four libraries only exist for compatibility reasons,
+# their version info should not be bumped anymore
 LIBSYSTEMD_LOGIN_CURRENT=9
 LIBSYSTEMD_LOGIN_REVISION=3
 LIBSYSTEMD_LOGIN_AGE=9
@@ -59,10 +65,6 @@ LIBSYSTEMD_JOURNAL_CURRENT=11
 LIBSYSTEMD_JOURNAL_REVISION=5
 LIBSYSTEMD_JOURNAL_AGE=11
 
-LIBSYSTEMD_CURRENT=1
-LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=1
-
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -86,6 +88,7 @@ pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
 userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
+sysusersdir=$(prefix)/lib/sysusers.d
 sysctldir=$(prefix)/lib/sysctl.d
 networkdir=$(rootprefix)/lib/systemd/network
 pkgincludedir=$(includedir)/systemd
@@ -190,6 +193,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/journal \
        -I $(top_srcdir)/src/timedate \
        -I $(top_srcdir)/src/timesync \
+       -I $(top_srcdir)/src/resolve \
        -I $(top_srcdir)/src/systemd \
        -I $(top_builddir)/src/core \
        -I $(top_srcdir)/src/core \
@@ -293,10 +297,14 @@ define install-relative-aliases
        done
 endef
 
+install-touch-usr-hook:
+       touch -c $(DESTDIR)/$(prefix)
+
 INSTALL_EXEC_HOOKS += \
        install-target-wants-hook \
        install-directories-hook \
-       install-aliases-hook
+       install-aliases-hook \
+       install-touch-usr-hook
 
 # ------------------------------------------------------------------------------
 AM_V_M4 = $(AM_V_M4_$(V))
@@ -357,12 +365,14 @@ rootlibexec_PROGRAMS = \
        systemd-sysctl \
        systemd-sleep \
        systemd-bus-proxyd \
-       systemd-socket-proxyd
+       systemd-socket-proxyd \
+       systemd-update-done
 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator \
        systemd-fstab-generator \
-       systemd-system-update-generator
+       systemd-system-update-generator \
+       systemd-debug-generator
 
 dist_bashcompletion_DATA = \
        shell-completion/bash/busctl \
@@ -412,6 +422,7 @@ dist_systemunit_DATA = \
        units/remote-fs.target \
        units/remote-fs-pre.target \
        units/network.target \
+       units/network-pre.target \
        units/network-online.target \
        units/nss-lookup.target \
        units/nss-user-lookup.target \
@@ -454,7 +465,8 @@ dist_systemunit_DATA = \
        units/systemd-udevd-control.socket \
        units/systemd-udevd-kernel.socket \
        units/system-update.target \
-       units/initrd-switch-root.target
+       units/initrd-switch-root.target \
+       units/ldconfig.service
 
 nodist_systemunit_DATA = \
        units/getty@.service \
@@ -485,12 +497,14 @@ nodist_systemunit_DATA = \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
+       units/systemd-udev-hwdb-update.service \
        units/debug-shell.service \
        units/initrd-parse-etc.service \
        units/initrd-cleanup.service \
        units/initrd-udevadm-cleanup-db.service \
        units/initrd-switch-root.service \
-       units/systemd-nspawn@.service
+       units/systemd-nspawn@.service \
+       units/systemd-update-done.service
 
 dist_userunit_DATA = \
        units/user/basic.target \
@@ -500,6 +514,9 @@ dist_userunit_DATA = \
 nodist_userunit_DATA = \
        units/user/systemd-exit.service
 
+dist_systempreset_DATA = \
+       system-preset/90-systemd.preset
+
 EXTRA_DIST += \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
@@ -533,7 +550,8 @@ EXTRA_DIST += \
        units/initrd-cleanup.service.in \
        units/initrd-udevadm-cleanup-db.service.in \
        units/initrd-switch-root.service.in \
-       units/systemd-nspawn@.service.in
+       units/systemd-nspawn@.service.in \
+       units/systemd-update-done.service.in
 
 CLEANFILES += \
        units/console-shell.service.m4 \
@@ -548,6 +566,7 @@ nodist_systemunit_DATA += \
        units/halt-local.service
 
 systemgenerator_PROGRAMS += \
+       systemd-sysv-generator \
        systemd-rc-local-generator
 endif
 
@@ -757,8 +776,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/replace-var.h \
        src/shared/spawn-polkit-agent.c \
        src/shared/spawn-polkit-agent.h \
-       src/shared/hwclock.c \
-       src/shared/hwclock.h \
+       src/shared/clock-util.c \
+       src/shared/clock-util.h \
        src/shared/time-dst.c \
        src/shared/time-dst.h \
        src/shared/calendarspec.c \
@@ -804,7 +823,11 @@ libsystemd_shared_la_SOURCES = \
        src/shared/ring.c \
        src/shared/ring.h \
        src/shared/async.c \
-       src/shared/async.h
+       src/shared/async.h \
+       src/shared/eventfd-util.c \
+       src/shared/eventfd-util.h \
+       src/shared/copy.c \
+       src/shared/copy.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -1218,7 +1241,10 @@ tests += \
        test-tables \
        test-device-nodes \
        test-xml \
-       test-architecture
+       test-architecture \
+       test-socket-util \
+       test-fdset \
+       test-conf-files
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
@@ -1322,12 +1348,24 @@ test_utf8_SOURCES = \
 test_utf8_LDADD = \
        libsystemd-shared.la
 
+test_fdset_SOURCES = \
+       src/test/test-fdset.c
+
+test_fdset_LDADD = \
+       libsystemd-core.la
+
 test_util_SOURCES = \
        src/test/test-util.c
 
 test_util_LDADD = \
        libsystemd-core.la
 
+test_socket_util_SOURCES = \
+       src/test/test-socket-util.c
+
+test_socket_util_LDADD = \
+       libsystemd-core.la
+
 test_ring_SOURCES = \
        src/test/test-ring.c
 
@@ -1563,6 +1601,12 @@ test_sched_prio_LDADD = \
        libsystemd-core.la \
        $(RT_LIBS)
 
+test_conf_files_SOURCES = \
+       src/test/test-conf-files.c
+
+test_conf_files_LDADD = \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 ## .PHONY so it always rebuilds it
 .PHONY: coverage lcov-run lcov-report coverage-sync
@@ -1630,6 +1674,14 @@ systemd_update_utmp_LDADD = \
        libsystemd-shared.la \
        $(AUDIT_LIBS)
 
+# ------------------------------------------------------------------------------
+systemd_update_done_SOURCES = \
+       src/update-done/update-done.c
+
+systemd_update_done_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_shutdownd_SOURCES = \
        src/shutdownd/shutdownd.c
@@ -1689,8 +1741,8 @@ endif
 endif
 
 EXTRA_DIST += \
-        units/systemd-modules-load.service.in \
-        units/kmod-static-nodes.service.in
+       units/systemd-modules-load.service.in \
+       units/kmod-static-nodes.service.in
 
 # ------------------------------------------------------------------------------
 if ENABLE_TMPFILES
@@ -1719,7 +1771,9 @@ dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
        tmpfiles.d/systemd-nologin.conf \
        tmpfiles.d/tmp.conf \
-       tmpfiles.d/x11.conf
+       tmpfiles.d/x11.conf \
+       tmpfiles.d/var.conf \
+       tmpfiles.d/etc.conf
 
 if HAVE_SYSV_COMPAT
 dist_tmpfiles_DATA += \
@@ -1746,6 +1800,41 @@ EXTRA_DIST += \
        units/systemd-tmpfiles-setup.service.in \
        units/systemd-tmpfiles-clean.service.in
 
+# ------------------------------------------------------------------------------
+if ENABLE_SYSUSERS
+systemd_sysusers_SOURCES = \
+       src/sysusers/sysusers.c
+
+systemd_sysusers_LDADD = \
+       libsystemd-units.la \
+       libsystemd-label.la \
+       libsystemd-capability.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
+rootbin_PROGRAMS += \
+       systemd-sysusers
+
+nodist_systemunit_DATA += \
+       units/systemd-sysusers.service
+
+SYSINIT_TARGET_WANTS += \
+       systemd-sysusers.service
+
+nodist_sysusers_DATA = \
+       sysusers.d/systemd.conf
+
+EXTRA_DIST += \
+       units/systemd-sysusers.service.in \
+       sysusers.d/systemd.conf.in
+
+CLEANFILES += \
+       sysusers.d/systemd.conf
+
+INSTALL_DIRS += \
+       $(sysusersdir)
+endif
+
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
        src/machine-id-setup/machine-id-setup-main.c \
@@ -1795,9 +1884,6 @@ systemd_detect_virt_SOURCES = \
 systemd_detect_virt_LDADD = \
        libsystemd-shared.la
 
-systemd-detect-virt-install-hook:
-       -$(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt
-
 INSTALL_EXEC_HOOKS += \
        systemd-detect-virt-install-hook
 
@@ -1816,6 +1902,14 @@ systemd_getty_generator_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_debug_generator_SOURCES = \
+       src/debug-generator/debug-generator.c
+
+systemd_debug_generator_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_fstab_generator_SOURCES = \
        src/fstab-generator/fstab-generator.c \
@@ -1914,6 +2008,15 @@ INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
 UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
 endif
 
+# ------------------------------------------------------------------------------
+systemd_sysv_generator_SOURCES = \
+       src/sysv-generator/sysv-generator.c
+
+systemd_sysv_generator_LDADD = \
+       libsystemd-core.la \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
        src/rc-local-generator/rc-local-generator.c
@@ -2030,9 +2133,12 @@ systemd_run_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_bus_proxyd_SOURCES = \
-       src/bus-proxyd/bus-proxyd.c
+       src/bus-proxyd/bus-proxyd.c \
+       src/bus-proxyd/bus-policy.c \
+       src/bus-proxyd/bus-policy.h
 
 systemd_bus_proxyd_LDADD = \
+       libsystemd-capability.la \
        libsystemd-internal.la \
        libsystemd-shared.la
 
@@ -2488,15 +2594,18 @@ libsystemd_network_la_CFLAGS = \
 libsystemd_network_la_SOURCES = \
        src/systemd/sd-network.h \
        src/systemd/sd-dhcp-client.h \
+       src/systemd/sd-dhcp-server.h \
        src/systemd/sd-dhcp-lease.h \
        src/systemd/sd-ipv4ll.h \
        src/network/sd-network.c \
        src/network/network-util.h \
        src/libsystemd-network/sd-dhcp-client.c \
+       src/libsystemd-network/sd-dhcp-server.c \
        src/libsystemd-network/dhcp-network.c \
        src/libsystemd-network/dhcp-option.c \
        src/libsystemd-network/dhcp-packet.c \
        src/libsystemd-network/dhcp-internal.h \
+       src/libsystemd-network/dhcp-server-internal.h \
        src/libsystemd-network/dhcp-protocol.h \
        src/libsystemd-network/dhcp-lease-internal.h \
        src/libsystemd-network/sd-dhcp-lease.c \
@@ -2505,9 +2614,21 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/ipv4ll-packet.c \
        src/libsystemd-network/ipv4ll-internal.h \
        src/libsystemd-network/network-internal.c \
-       src/libsystemd-network/network-internal.h
+       src/libsystemd-network/network-internal.h \
+       src/systemd/sd-icmp6-nd.h \
+       src/systemd/sd-dhcp6-client.h \
+       src/systemd/sd-dhcp6-lease.h \
+       src/libsystemd-network/sd-icmp6-nd.c \
+       src/libsystemd-network/sd-dhcp6-client.c \
+       src/libsystemd-network/dhcp6-internal.h \
+       src/libsystemd-network/dhcp6-protocol.h \
+       src/libsystemd-network/dhcp6-network.c \
+       src/libsystemd-network/dhcp6-option.c \
+       src/libsystemd-network/dhcp6-lease-internal.h \
+       src/libsystemd-network/sd-dhcp6-lease.c
 
 libsystemd_network_la_LIBADD = \
+       libudev-internal.la \
        libsystemd-label.la \
        libsystemd-internal.la \
        libsystemd-shared.la \
@@ -2535,21 +2656,53 @@ test_dhcp_client_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
+test_dhcp_server_SOURCES = \
+       src/libsystemd-network/test-dhcp-server.c
+
+test_dhcp_server_LDADD = \
+       libsystemd-network.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
 test_ipv4ll_SOURCES = \
-        src/systemd/sd-ipv4ll.h \
-        src/libsystemd-network/ipv4ll-internal.h \
-        src/libsystemd-network/test-ipv4ll.c
+       src/systemd/sd-ipv4ll.h \
+       src/libsystemd-network/ipv4ll-internal.h \
+       src/libsystemd-network/test-ipv4ll.c
 
 test_ipv4ll_LDADD = \
-        libsystemd-network.la \
-        libsystemd-label.la \
-        libsystemd-internal.la \
-        libsystemd-shared.la
+       libsystemd-network.la \
+       libsystemd-label.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
+test_icmp6_rs_SOURCES = \
+       src/systemd/sd-dhcp6-client.h \
+       src/systemd/sd-icmp6-nd.h \
+       src/libsystemd-network/dhcp6-internal.h \
+       src/libsystemd-network/test-icmp6-rs.c
+
+test_icmp6_rs_LDADD = \
+       libsystemd-network.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
+test_dhcp6_client_SOURCES = \
+       src/systemd/sd-dhcp6-client.h \
+       src/libsystemd-network/dhcp6-internal.h \
+       src/libsystemd-network/test-dhcp6-client.c
+
+test_dhcp6_client_LDADD = \
+       libsystemd-network.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
 tests += \
        test-dhcp-option \
        test-dhcp-client \
-       test-ipv4ll
+       test-dhcp-server \
+       test-ipv4ll \
+       test-icmp6-rs \
+       test-dhcp6-client
 
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
@@ -2696,19 +2849,23 @@ CLEANFILES += \
 EXTRA_DIST += \
        units/systemd-udevd.service.in \
        units/systemd-udev-trigger.service.in \
-       units/systemd-udev-settle.service.in
+       units/systemd-udev-settle.service.in \
+       units/systemd-udev-hwdb-update.service.in
 
 CLEANFILES += \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
-       units/systemd-udev-settle.service
+       units/systemd-udev-settle.service \
+       units/systemd-udev-hwdb-update.service
 
 SOCKETS_TARGET_WANTS += \
        systemd-udevd-control.socket \
        systemd-udevd-kernel.socket
+
 SYSINIT_TARGET_WANTS += \
        systemd-udevd.service \
-       systemd-udev-trigger.service
+       systemd-udev-trigger.service \
+       systemd-udev-hwdb-update.service
 
 rootbin_PROGRAMS += \
        udevadm
@@ -3433,7 +3590,7 @@ libsystemd_journal_internal_la_SOURCES = \
        src/journal/mmap-cache.h
 
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
-libsystemd_journal_internal_la_CFLAGS =
+libsystemd_journal_internal_la_CFLAGS = \
        $(AM_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD =
@@ -3478,11 +3635,13 @@ bin_PROGRAMS += \
        systemd-cat
 
 dist_systemunit_DATA += \
-       units/systemd-journald.socket
+       units/systemd-journald.socket \
+       units/systemd-journald-dev-log.socket
 
 nodist_systemunit_DATA += \
        units/systemd-journald.service \
-       units/systemd-journal-flush.service
+       units/systemd-journal-flush.service \
+       units/systemd-journal-catalog-update.service
 
 dist_pkgsysconf_DATA += \
        src/journal/journald.conf
@@ -3494,14 +3653,18 @@ dist_catalog_DATA = \
        catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \
-       systemd-journald.socket
+       systemd-journald.socket \
+       systemd-journald-dev-log.socket
+
 SYSINIT_TARGET_WANTS += \
        systemd-journald.service \
-       systemd-journal-flush.service
+       systemd-journal-flush.service \
+       systemd-journal-catalog-update.service
 
 EXTRA_DIST += \
        units/systemd-journald.service.in \
        units/systemd-journal-flush.service.in \
+       units/systemd-journal-catalog-update.service.in \
        src/journal/journald-gperf.gperf
 
 CLEANFILES += \
@@ -3562,7 +3725,8 @@ systemd_socket_proxyd_LDADD = \
        libsystemd-logs.la \
        libsystemd-internal.la \
        libsystemd-journal-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-resolve.la
 
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
@@ -3575,25 +3739,42 @@ systemd_coredump_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
+if HAVE_ELFUTILS
+systemd_coredump_SOURCES += \
+       src/journal/stacktrace.c \
+       src/journal/stacktrace.h
+
+systemd_coredump_LDADD += \
+       $(ELFUTILS_LIBS)
+endif
+
 rootlibexec_PROGRAMS += \
        systemd-coredump
 
-systemd_coredumpctl_SOURCES = \
+dist_pkgsysconf_DATA += \
+       src/journal/coredump.conf
+
+if HAVE_ACL
+systemd_coredump_LDADD += \
+       libsystemd-acl.la
+endif
+
+coredumpctl_SOURCES = \
        src/journal/coredumpctl.c
 
-systemd_coredumpctl_LDADD = \
+coredumpctl_LDADD = \
        libsystemd-journal-internal.la \
        libsystemd-internal.la \
        libsystemd-shared.la
 
 bin_PROGRAMS += \
-       systemd-coredumpctl
+       coredumpctl
 
 dist_bashcompletion_DATA += \
-       shell-completion/bash/systemd-coredumpctl
+       shell-completion/bash/coredumpctl
 
 dist_zshcompletion_DATA += \
-       shell-completion/zsh/_systemd-coredumpctl
+       shell-completion/zsh/_coredumpctl
 
 sysctl_DATA = \
        sysctl.d/50-coredump.conf
@@ -3822,7 +4003,8 @@ systemgenerator_PROGRAMS += \
        systemd-cryptsetup-generator
 
 dist_systemunit_DATA += \
-       units/cryptsetup.target
+       units/cryptsetup.target \
+       units/cryptsetup-pre.target
 
 systemd_cryptsetup_SOURCES = \
        src/cryptsetup/cryptsetup.c
@@ -4062,12 +4244,12 @@ CLEANFILES += \
        src/timesync/timesyncd-gperf.c
 
 systemd_timesyncd_LDADD = \
-       libsystemd-label.la \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
        libsystemd-resolve.la \
        libsystemd-network.la \
+       libsystemd-label.la \
        libsystemd-capability.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la \
        -lm
 
 rootlibexec_PROGRAMS += \
@@ -4214,10 +4396,11 @@ CLEANFILES += \
        src/resolve/resolved-gperf.c
 
 systemd_resolved_LDADD = \
+       libsystemd-capability.la \
+       libsystemd-network.la \
        libsystemd-label.la \
        libsystemd-internal.la \
-       libsystemd-shared.la \
-       libsystemd-network.la
+       libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
        systemd-resolved
@@ -4252,14 +4435,13 @@ systemd_networkd_SOURCES = \
 
 systemd_networkd_LDADD = \
        libsystemd-networkd-core.la \
-       $(KMOD_LIBS)
+       libsystemd-capability.la
 
 noinst_LTLIBRARIES += \
        libsystemd-networkd-core.la
 
 libsystemd_networkd_core_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(KMOD_CFLAGS)
+       $(AM_CFLAGS)
 
 libsystemd_networkd_core_la_SOURCES = \
        src/libsystemd-network/network-internal.h \
@@ -4267,10 +4449,13 @@ libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd-link.c \
        src/network/networkd-netdev.c \
        src/network/networkd-tunnel.c \
+       src/network/networkd-veth.c \
+       src/network/networkd-vxlan.c \
        src/network/networkd-network.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
-       src/network/networkd-manager.c
+       src/network/networkd-manager.c \
+       src/network/networkd-address-pool.c
 
 nodist_libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd-network-gperf.c \
@@ -4287,8 +4472,7 @@ rootlibexec_PROGRAMS += \
        systemd-networkd-wait-online
 
 systemd_networkd_wait_online_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(KMOD_CFLAGS)
+       $(AM_CFLAGS)
 
 systemd_networkd_wait_online_SOURCES = \
        src/libsystemd-network/network-internal.h \
@@ -4299,19 +4483,16 @@ systemd_networkd_wait_online_LDADD = \
        libsystemd-network.la \
        libudev-internal.la \
        libsystemd-internal.la \
-       libsystemd-shared.la \
-       libsystemd-network.la
+       libsystemd-shared.la
 
 test_network_SOURCES = \
        src/network/test-network.c
 
 test_network_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(KMOD_CFLAGS)
+       $(AM_CFLAGS)
 
 test_network_LDADD = \
        libsystemd-networkd-core.la
-       $(KMOD_LIBS)
 
 tests += \
        test-network
@@ -4322,7 +4503,7 @@ nodist_systemunit_DATA += \
 
 GENERAL_ALIASES += \
        $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
-       $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
+       $(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
 
 EXTRA_DIST += \
        src/network/networkd-network-gperf.gperf \
@@ -4593,10 +4774,12 @@ _journal_la_LIBADD = \
 
 id128_la_SOURCES = \
        src/python-systemd/id128.c \
-       src/python-systemd/id128-constants.h \
        src/python-systemd/pyutil.c \
        src/python-systemd/pyutil.h
 
+nodist_id128_la_SOURCES = \
+       src/python-systemd/id128-constants.h
+
 id128_la_CFLAGS = \
        $(AM_CFLAGS) \
        -fvisibility=default \
@@ -4858,6 +5041,7 @@ substitutions = \
        '|udevrulesdir=$(udevrulesdir)|' \
        '|catalogdir=$(catalogdir)|' \
        '|tmpfilesdir=$(tmpfilesdir)|' \
+       '|sysusersdir=$(sysusersdir)|' \
        '|sysctldir=$(sysctldir)|' \
        '|systemgeneratordir=$(systemgeneratordir)|' \
        '|usergeneratordir=$(usergeneratordir)|' \
@@ -4889,7 +5073,8 @@ substitutions = \
        '|NTP_SERVERS=$(NTP_SERVERS)|' \
        '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
-       '|systemgidmax=$(SYSTEM_GID_MAX)|'
+       '|systemgidmax=$(SYSTEM_GID_MAX)|' \
+       '|TTY_GID=$(TTY_GID)|'
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -5051,14 +5236,20 @@ RUNLEVEL4_TARGET_WANTS += \
 RUNLEVEL5_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
 endif
+
 SYSINIT_TARGET_WANTS += \
-       systemd-update-utmp.service
+       systemd-update-utmp.service \
+       systemd-update-done.service \
+       ldconfig.service
+
 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \
        tmp.mount
+
 MULTI_USER_TARGET_WANTS += \
        getty.target \
        systemd-ask-password-wall.path
+
 SYSINIT_TARGET_WANTS += \
        dev-hugepages.mount \
        dev-mqueue.mount \
@@ -5168,6 +5359,11 @@ DISTCHECK_CONFIGURE_FLAGS += \
        --with-sysvrcnd-path=
 endif
 
+if HAVE_PYTHON
+DISTCHECK_CONFIGURE_FLAGS += \
+       --with-python
+endif
+
 if ENABLE_GTK_DOC
 DISTCHECK_CONFIGURE_FLAGS += \
        --enable-gtk-doc
@@ -5182,9 +5378,9 @@ linkcheck:
 hwdb-update:
        ( 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 && \
+               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 )
 
 .PHONY: kdbus-update
@@ -5229,7 +5425,7 @@ valgrind-tests: $(TESTS)
                if 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; \
+               libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
                x="\n\n"; \
        done
 
@@ -5321,60 +5517,6 @@ tests += \
        test-libsystemd-sym \
        test-libudev-sym
 
-if ENABLE_COMPAT_LIBS
-test-libsystemd-daemon-sym.c: \
-               src/compat-libs/libsystemd-daemon.sym \
-               src/systemd/sd-daemon.h
-       $(generate-sym-test)
-
-test-libsystemd-id128-sym.c: \
-               src/compat-libs/libsystemd-id128.sym \
-               src/systemd/sd-id128.h
-       $(generate-sym-test)
-
-test-libsystemd-journal-sym.c: \
-               src/compat-libs/libsystemd-journal.sym \
-               src/systemd/sd-journal.h
-       $(generate-sym-test)
-
-test-libsystemd-login-sym.c: \
-               src/compat-libs/libsystemd-login.sym \
-               src/systemd/sd-login.h
-       $(generate-sym-test)
-
-test_libsystemd_daemon_sym_SOURCES = \
-       test-libsystemd-daemon-sym.c
-test_libsystemd_daemon_sym_LDADD = \
-       libsystemd-daemon.la
-
-test_libsystemd_id128_sym_SOURCES = \
-       test-libsystemd-id128-sym.c
-test_libsystemd_id128_sym_LDADD = \
-       libsystemd-id128.la
-
-test_libsystemd_journal_sym_SOURCES = \
-       test-libsystemd-journal-sym.c
-test_libsystemd_journal_sym_LDADD = \
-       libsystemd-journal.la
-
-test_libsystemd_login_sym_SOURCES = \
-       test-libsystemd-login-sym.c
-test_libsystemd_login_sym_LDADD = \
-       libsystemd-login.la
-
-BUILT_SOURCES += \
-       $(test_libsystemd_journal_sym_SOURCES) \
-       $(test_libsystemd_login_sym_SOURCES) \
-       $(test_libsystemd_id128_sym_SOURCES) \
-       $(test_libsystemd_daemon_sym_SOURCES)
-
-tests += \
-       test-libsystemd-journal-sym \
-       test-libsystemd-login-sym \
-       test-libsystemd-id128-sym \
-       test-libsystemd-daemon-sym
-endif
-
 .PHONY: cppcheck
 cppcheck:
        cppcheck --enable=all -q $(top_srcdir)