]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - Makefile.am
Merge pull request #501 from keszybz/remove-python-systemd
[thirdparty/systemd.git] / Makefile.am
index 9c52dcb3e312fd9fd11e83a1a885c839abc88021..a8d4d372d3832043fcdd69ee19ccdd05b174d285 100644 (file)
@@ -39,12 +39,12 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBUDEV_CURRENT=7
-LIBUDEV_REVISION=3
+LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=7
+LIBSYSTEMD_CURRENT=9
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=7
+LIBSYSTEMD_AGE=9
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
@@ -137,7 +137,6 @@ dist_udevrules_DATA =
 nodist_udevrules_DATA =
 dist_pkgsysconf_DATA =
 nodist_pkgsysconf_DATA =
-dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
 dist_dbussystemservice_DATA =
 dist_systemunit_DATA_busnames =
@@ -233,7 +232,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/libsystemd/sd-bus \
        -I $(top_srcdir)/src/libsystemd/sd-event \
        -I $(top_srcdir)/src/libsystemd/sd-login \
-       -I $(top_srcdir)/src/libsystemd/sd-rtnl \
+       -I $(top_srcdir)/src/libsystemd/sd-netlink \
        -I $(top_srcdir)/src/libsystemd/sd-network \
        -I $(top_srcdir)/src/libsystemd/sd-hwdb \
        -I $(top_srcdir)/src/libsystemd/sd-device \
@@ -338,10 +337,8 @@ INSTALL_EXEC_HOOKS += \
        install-aliases-hook \
        install-touch-usr-hook
 
-if ENABLE_KDBUS
 INSTALL_EXEC_HOOKS += \
        install-busnames-target-wants-hook
-endif
 
 # ------------------------------------------------------------------------------
 AM_V_M4 = $(AM_V_M4_$(V))
@@ -436,6 +433,7 @@ nodist_bashcompletion_DATA = \
        shell-completion/bash/systemctl
 
 dist_zshcompletion_DATA = \
+       shell-completion/zsh/_busctl \
        shell-completion/zsh/_journalctl \
        shell-completion/zsh/_udevadm \
        shell-completion/zsh/_kernel-install \
@@ -522,10 +520,8 @@ dist_systemunit_DATA = \
        units/initrd-switch-root.target \
        units/machines.target
 
-if ENABLE_KDBUS
 dist_systemunit_DATA += \
        $(dist_systemunit_DATA_busnames)
-endif
 
 dist_systemunit_DATA_busnames += \
        units/busnames.target
@@ -643,13 +639,21 @@ UNINSTALL_DATA_HOOKS += units-uninstall-hook
 
 dist_doc_DATA = \
        README \
+       README.md \
        NEWS \
+       CODING_STYLE \
        LICENSE.LGPL2.1 \
        LICENSE.GPL2 \
        DISTRO_PORTING \
        src/libsystemd/sd-bus/PORTING-DBUS1 \
        src/libsystemd/sd-bus/DIFFERENCES \
-       src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
+       src/libsystemd/sd-bus/GVARIANT-SERIALIZATION \
+       autogen.sh \
+       .dir-locals.el \
+       .vimrc \
+       .ycm_extra_conf.py \
+       .travis.yml \
+       .mailmap
 
 @INTLTOOL_POLICY_RULE@
 
@@ -704,10 +708,13 @@ noinst_DATA += \
 CLEANFILES += \
        man/index.html
 
-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_builddir)/man/*.xml)
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
-SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))
+SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))}
 
+# This target should only be run manually. It recreates Makefile-man.am
+# file in the source directory based on all man/*.xml files. Run it after
+# adding, removing, or changing the conditional in a man page.
 update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB)
        $(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
        $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
@@ -725,23 +732,19 @@ CLEANFILES += \
        man/systemd.index.xml \
        man/systemd.directives.xml
 
+EXTRA_DIST += \
+       tools/make-man-rules.py
+
 endif
 
 endif
 
 EXTRA_DIST += \
-       $(XML_FILES) \
-       $(HTML_FILES) \
-       $(HTML_ALIAS) \
-       $(man_MANS) \
+       $(filter-out man/systemd.directives.xml man/systemd.index.xml,$(XML_FILES)) \
        tools/make-man-index.py \
        tools/make-directive-index.py \
        tools/xml_helper.py \
-       man/systemd.index.xml \
-       man/index.html \
-       man/systemd.directives.xml \
-       man/glib-event-glue.c \
-       $(NULL)
+       man/glib-event-glue.c
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -905,6 +908,8 @@ libbasic_la_CFLAGS = \
 libbasic_la_LIBADD = \
        $(SELINUX_LIBS) \
        $(CAP_LIBS) \
+       -ldl \
+       -lrt \
        -lm
 
 # -----------------------------------------------------------------------------
@@ -1012,21 +1017,17 @@ endif
 
 libshared_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SELINUX_CFLAGS) \
-       $(CAP_CFLAGS) \
        $(ACL_CFLAGS) \
-       $(SECCOMP_CFLAGS) \
-       -pthread
+       $(LIBIDN_CFLAGS) \
+       $(SECCOMP_CFLAGS)
 
 libshared_la_LIBADD = \
        libsystemd-internal.la \
        libsystemd-journal-internal.la \
-       $(SELINUX_LIBS) \
-       $(CAP_LIBS) \
+       libudev-internal.la \
        $(ACL_LIBS) \
        $(LIBIDN_LIBS) \
-       $(SECCOMP_LIBS) \
-       -lm
+       $(SECCOMP_LIBS)
 
 # -----------------------------------------------------------------------------
 if HAVE_LIBIPTC
@@ -1034,8 +1035,8 @@ noinst_LTLIBRARIES += \
        libfirewall.la
 
 libfirewall_la_SOURCES = \
-       src/shared/fw-util.h \
-       src/shared/fw-util.c
+       src/shared/firewall-util.h \
+       src/shared/firewall-util.c
 
 libfirewall_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1191,10 +1192,9 @@ libcore_la_CFLAGS = \
        $(KMOD_CFLAGS) \
        $(APPARMOR_CFLAGS) \
        $(MOUNT_CFLAGS) \
-       -pthread
+       $(SECCOMP_CFLAGS)
 
 libcore_la_LIBADD = \
-       libudev-internal.la \
        libshared.la \
        $(PAM_LIBS) \
        $(AUDIT_LIBS) \
@@ -1290,14 +1290,14 @@ src/basic/cap-from-name.h: src/basic/cap-from-name.gperf
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
 
-audit_list_includes = -include linux/audit.h missing.h
+audit_list_includes = -include linux/audit.h -include missing.h
 if HAVE_AUDIT
 audit_list_includes += -include libaudit.h
 endif
 
 src/journal/audit_type-list.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/audit.h -include missing.h - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@
+       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM $(audit_list_includes) - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@
 
 src/journal/audit_type-to-name.h: src/journal/audit_type-list.txt
        $(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -1320,9 +1320,12 @@ src/resolve/dns_type-from-name.gperf: src/resolve/dns_type-list.txt
 systemd_SOURCES = \
        src/core/main.c
 
+systemd_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SECCOMP_CFLAGS)
+
 systemd_LDADD = \
-       libcore.la \
-       $(RT_LIBS)
+       libcore.la
 
 dist_pkgsysconf_DATA += \
        src/core/system.conf \
@@ -1363,12 +1366,12 @@ manual_tests += \
 
 if HAVE_LIBIPTC
 manual_tests += \
-       test-fw-util
+       test-firewall-util
 endif
 
 if HAVE_KMOD
 manual_tests += \
-       test-rtnl-manual
+       test-netlink-manual
 endif
 
 tests += \
@@ -1525,8 +1528,7 @@ test_engine_CFLAGS = \
        $(SECCOMP_CFLAGS)
 
 test_engine_LDADD = \
-       libcore.la \
-       $(RT_LIBS)
+       libcore.la
 
 test_job_type_SOURCES = \
        src/test/test-job-type.c
@@ -1536,8 +1538,7 @@ test_job_type_CFLAGS = \
        $(SECCOMP_CFLAGS)
 
 test_job_type_LDADD = \
-       libcore.la \
-       $(RT_LIBS)
+       libcore.la
 
 test_ns_SOURCES = \
        src/test/test-ns.c
@@ -1566,8 +1567,7 @@ test_dns_domain_SOURCES = \
 
 test_dns_domain_LDADD = \
        libsystemd-network.la \
-       libshared.la \
-       $(LIBIDN_LIBS)
+       libshared.la
 
 if ENABLE_EFI
 manual_tests += \
@@ -1588,8 +1588,7 @@ test_unit_name_CFLAGS = \
        $(SECCOMP_CFLAGS)
 
 test_unit_name_LDADD = \
-       libcore.la \
-       $(RT_LIBS)
+       libcore.la
 
 test_unit_file_SOURCES = \
        src/test/test-unit-file.c
@@ -1599,8 +1598,7 @@ test_unit_file_CFLAGS = \
        $(SECCOMP_CFLAGS)
 
 test_unit_file_LDADD = \
-       libcore.la \
-       $(RT_LIBS)
+       libcore.la
 
 test_utf8_SOURCES = \
        src/test/test-utf8.c
@@ -1684,7 +1682,6 @@ test_path_lookup_SOURCES = \
        src/test/test-path-lookup.c
 
 test_path_lookup_LDADD = \
-       -lm \
        libshared.la
 
 test_uid_range_SOURCES = \
@@ -1810,11 +1807,9 @@ test_tables_CFLAGS = \
        $(SECCOMP_CFLAGS)
 
 test_tables_LDADD = \
-       libsystemd-journal-internal.la \
        libjournal-core.la \
        libcore.la \
-       libudev-core.la \
-       $(RT_LIBS)
+       libudev-core.la
 
 test_prioq_SOURCES = \
        src/test/test-prioq.c
@@ -1850,8 +1845,7 @@ test_ipcrm_SOURCES = \
        src/test/test-ipcrm.c
 
 test_ipcrm_LDADD = \
-       libshared.la \
-       -lrt
+       libshared.la
 
 test_btrfs_SOURCES = \
        src/test/test-btrfs.c
@@ -1860,27 +1854,27 @@ test_btrfs_LDADD = \
        libshared.la
 
 if HAVE_LIBIPTC
-test_fw_util_SOURCES = \
-       src/test/test-fw-util.c
+test_firewall_util_SOURCES = \
+       src/test/test-firewall-util.c
 
-test_fw_util_CFLAGS = \
+test_firewall_util_CFLAGS = \
        $(AM_CFLAGS) \
        $(LIBIPTC_CFLAGS)
 
-test_fw_util_LDADD = \
+test_firewall_util_LDADD = \
        libfirewall.la \
        libshared.la \
        $(LIBIPTC_LIBS)
 endif
 
-test_rtnl_manual_SOURCES = \
-       src/test/test-rtnl-manual.c
+test_netlink_manual_SOURCES = \
+       src/test/test-netlink-manual.c
 
-test_rtnl_manual_CFLAGS = \
+test_netlink_manual_CFLAGS = \
        $(AM_CFLAGS) \
        $(KMOD_CFLAGS)
 
-test_rtnl_manual_LDADD = \
+test_netlink_manual_LDADD = \
        libshared.la \
        $(KMOD_LIBS)
 
@@ -1943,8 +1937,7 @@ test_cgroup_mask_CFLAGS = \
        $(SECCOMP_CFLAGS)
 
 test_cgroup_mask_LDADD = \
-       libcore.la \
-       $(RT_LIBS)
+       libcore.la
 
 test_cgroup_util_SOURCES = \
        src/test/test-cgroup-util.c
@@ -2023,8 +2016,7 @@ test_sched_prio_CFLAGS = \
        $(SECCOMP_CFLAGS)
 
 test_sched_prio_LDADD = \
-       libcore.la \
-       $(RT_LIBS)
+       libcore.la
 
 test_conf_files_SOURCES = \
        src/test/test-conf-files.c
@@ -2095,8 +2087,7 @@ systemd_analyze_CFLAGS = \
        $(SECCOMP_CFLAGS)
 
 systemd_analyze_LDADD = \
-       libcore.la \
-       $(RT_LIBS)
+       libcore.la
 
 # ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
@@ -2135,7 +2126,6 @@ systemd_shutdown_SOURCES = \
        src/core/killall.c
 
 systemd_shutdown_LDADD = \
-       libudev-internal.la \
        libshared.la
 
 # ------------------------------------------------------------------------------
@@ -2201,7 +2191,9 @@ dist_tmpfiles_DATA = \
        tmpfiles.d/tmp.conf \
        tmpfiles.d/x11.conf \
        tmpfiles.d/var.conf \
-       tmpfiles.d/home.conf
+       tmpfiles.d/home.conf \
+       tmpfiles.d/systemd-nspawn.conf \
+       tmpfiles.d/journal-nocow.conf
 
 if HAVE_SYSV_COMPAT
 dist_tmpfiles_DATA += \
@@ -2320,7 +2312,6 @@ systemd_fsck_SOURCES = \
        src/fsck/fsck.c
 
 systemd_fsck_LDADD = \
-       libudev-internal.la \
        libshared.la
 
 # ------------------------------------------------------------------------------
@@ -2340,7 +2331,6 @@ systemd_ac_power_SOURCES = \
        src/ac-power/ac-power.c
 
 systemd_ac_power_LDADD = \
-       libudev-internal.la \
        libshared.la
 
 # ------------------------------------------------------------------------------
@@ -2580,7 +2570,10 @@ stub_sources = \
        src/boot/efi/linux.c \
        src/boot/efi/stub.c
 
-EXTRA_DIST += $(stub_sources) $(stub_headers)
+EXTRA_DIST += \
+       $(stub_sources) \
+       $(stub_headers) \
+       test/splash.bmp
 
 if ENABLE_EFI
 if HAVE_GNUEFI
@@ -2627,7 +2620,6 @@ systemd_gpt_auto_generator_SOURCES = \
        src/basic/blkid-util.h
 
 systemd_gpt_auto_generator_LDADD = \
-       libudev-internal.la \
        libshared.la \
        $(BLKID_LIBS)
 
@@ -2637,7 +2629,6 @@ systemd_gpt_auto_generator_CFLAGS = \
 endif
 
 # ------------------------------------------------------------------------------
-if ENABLE_KDBUS
 systemgenerator_PROGRAMS +=  \
        systemd-dbus1-generator
 
@@ -2660,7 +2651,6 @@ dist_xinitrc_SCRIPTS = \
 
 INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
 UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
-endif
 
 # ------------------------------------------------------------------------------
 systemd_sysv_generator_SOURCES = \
@@ -2704,7 +2694,6 @@ systemctl_SOURCES = \
        src/systemctl/systemctl.c
 
 systemctl_LDADD = \
-       libsystemd-journal-internal.la \
        libshared.la
 
 # ------------------------------------------------------------------------------
@@ -2759,10 +2748,10 @@ systemd_nspawn_SOURCES = \
 
 systemd_nspawn_CFLAGS = \
        $(AM_CFLAGS) \
-       $(BLKID_CFLAGS)
+       $(BLKID_CFLAGS) \
+       $(SECCOMP_CFLAGS)
 
 systemd_nspawn_LDADD = \
-       libudev-internal.la \
        libshared.la \
        $(BLKID_LIBS)
 
@@ -2792,20 +2781,12 @@ libbus_proxy_core_la_SOURCES = \
        src/bus-proxyd/synthesize.c \
        src/bus-proxyd/synthesize.h
 
-libbus_proxy_core_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
-
 libbus_proxy_core_la_LIBADD = \
        libshared.la
 
 systemd_bus_proxyd_SOURCES = \
        src/bus-proxyd/bus-proxyd.c
 
-systemd_bus_proxyd_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
-
 systemd_bus_proxyd_LDADD = \
        libbus-proxy-core.la \
        libshared.la
@@ -2817,7 +2798,6 @@ systemd_stdio_bridge_LDADD = \
        libbus-proxy-core.la \
        libshared.la
 
-if ENABLE_KDBUS
 nodist_systemunit_DATA += \
        units/systemd-bus-proxyd.service
 
@@ -2829,7 +2809,6 @@ nodist_userunit_DATA += \
 
 dist_userunit_DATA += \
        units/user/systemd-bus-proxyd.socket
-endif
 
 EXTRA_DIST += \
        units/systemd-bus-proxyd.service.m4.in \
@@ -2856,7 +2835,7 @@ libsystemd_internal_la_SOURCES = \
        src/systemd/sd-bus-vtable.h \
        src/systemd/sd-utf8.h \
        src/systemd/sd-event.h \
-       src/systemd/sd-rtnl.h \
+       src/systemd/sd-netlink.h \
        src/systemd/sd-resolve.h \
        src/systemd/sd-login.h \
        src/systemd/sd-id128.h \
@@ -2865,6 +2844,7 @@ libsystemd_internal_la_SOURCES = \
        src/systemd/sd-network.h \
        src/systemd/sd-hwdb.h \
        src/systemd/sd-device.h \
+       src/libsystemd/libsystemd.sym \
        src/libsystemd/sd-bus/sd-bus.c \
        src/libsystemd/sd-bus/bus-control.c \
        src/libsystemd/sd-bus/bus-control.h \
@@ -2910,15 +2890,17 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-utf8/sd-utf8.c \
        src/libsystemd/sd-event/sd-event.c \
        src/libsystemd/sd-event/event-util.h \
-       src/libsystemd/sd-rtnl/sd-rtnl.c \
-       src/libsystemd/sd-rtnl/rtnl-internal.h \
-       src/libsystemd/sd-rtnl/rtnl-message.c \
-       src/libsystemd/sd-rtnl/rtnl-types.h \
-       src/libsystemd/sd-rtnl/rtnl-types.c \
-       src/libsystemd/sd-rtnl/rtnl-util.h \
-       src/libsystemd/sd-rtnl/rtnl-util.c \
-       src/libsystemd/sd-rtnl/local-addresses.h \
-       src/libsystemd/sd-rtnl/local-addresses.c \
+       src/libsystemd/sd-netlink/sd-netlink.c \
+       src/libsystemd/sd-netlink/netlink-internal.h \
+       src/libsystemd/sd-netlink/netlink-message.c \
+       src/libsystemd/sd-netlink/netlink-socket.c \
+       src/libsystemd/sd-netlink/rtnl-message.c \
+       src/libsystemd/sd-netlink/netlink-types.h \
+       src/libsystemd/sd-netlink/netlink-types.c \
+       src/libsystemd/sd-netlink/netlink-util.h \
+       src/libsystemd/sd-netlink/netlink-util.c \
+       src/libsystemd/sd-netlink/local-addresses.h \
+       src/libsystemd/sd-netlink/local-addresses.c \
        src/libsystemd/sd-id128/sd-id128.c \
        src/libsystemd/sd-daemon/sd-daemon.c \
        src/libsystemd/sd-login/sd-login.c \
@@ -2935,46 +2917,24 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-device/device-enumerator-private.h \
        src/libsystemd/sd-device/sd-device.c \
        src/libsystemd/sd-device/device-private.c \
-       src/libsystemd/sd-device/device-private.h
-
-nodist_libsystemd_internal_la_SOURCES = \
-       src/libsystemd/libsystemd.sym
-
-libsystemd_internal_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
-
-libsystemd_internal_la_LIBADD = \
-       libbasic.la \
-       $(RT_LIBS)
-
-libsystemd_resolve_la_SOURCES = \
+       src/libsystemd/sd-device/device-private.h \
        src/libsystemd/sd-resolve/sd-resolve.c \
        src/libsystemd/sd-resolve/resolve-util.h
 
-libsystemd_resolve_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
-
-libsystemd_resolve_la_LIBADD = \
+libsystemd_internal_la_LIBADD = \
+       libbasic.la \
        -lresolv
 
 noinst_LTLIBRARIES += \
-       libsystemd-internal.la \
-       libsystemd-resolve.la
+       libsystemd-internal.la
 
 EXTRA_DIST += \
-       src/libsystemd/libsystemd.sym.m4 \
        src/libsystemd/libsystemd.pc.in \
        src/libsystemd/sd-bus/DIFFERENCES \
        src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 
-BUILT_SOURCES += \
-       src/libsystemd/libsystemd.sym
-
 libsystemd_la_SOURCES = \
        $(libsystemd_internal_la_SOURCES) \
-       $(libsystemd_resolve_la_SOURCES) \
        $(libsystemd_journal_internal_la_SOURCES)
 
 nodist_libsystemd_la_SOURCES = \
@@ -2982,18 +2942,16 @@ nodist_libsystemd_la_SOURCES = \
 
 libsystemd_la_CFLAGS = \
        $(libsystemd_internal_la_CFLAGS) \
-       $(libsystemd_resolve_la_CFLAGS) \
        $(libsystemd_journal_internal_la_CFLAGS)
 
 libsystemd_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
-       -Wl,--version-script=$(top_builddir)/src/libsystemd/libsystemd.sym
+       -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
 
 libsystemd_la_LIBADD = \
        $(libsystemd_internal_la_LIBADD) \
-       $(libsystemd_journal_internal_la_LIBADD) \
-       $(libsystemd_resolve_la_LIBADD)
+       $(libsystemd_journal_internal_la_LIBADD)
 
 libsystemd-install-hook:
        libname=libsystemd.so && $(move-to-rootlibdir)
@@ -3016,14 +2974,6 @@ pkginclude_HEADERS += \
        src/systemd/sd-id128.h \
        src/systemd/sd-daemon.h
 
-if ENABLE_KDBUS
-pkginclude_HEADERS += \
-       src/systemd/sd-utf8.h \
-       src/systemd/sd-rtnl.h \
-       src/systemd/sd-resolve.h \
-       src/systemd/sd-path.h
-endif
-
 lib_LTLIBRARIES += \
        libsystemd.la
 
@@ -3044,7 +2994,7 @@ tests += \
        test-bus-creds \
        test-bus-gvariant \
        test-event \
-       test-rtnl \
+       test-netlink \
        test-local-addresses \
        test-resolve
 
@@ -3073,10 +3023,6 @@ test_bus_signature_LDADD = \
 test_bus_chat_SOURCES = \
        src/libsystemd/sd-bus/test-bus-chat.c
 
-test_bus_chat_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
-
 test_bus_chat_LDADD = \
        libshared.la
 
@@ -3093,20 +3039,12 @@ test_bus_cleanup_LDADD = \
 test_bus_server_SOURCES = \
        src/libsystemd/sd-bus/test-bus-server.c
 
-test_bus_server_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
-
 test_bus_server_LDADD = \
        libshared.la
 
 test_bus_objects_SOURCES = \
        src/libsystemd/sd-bus/test-bus-objects.c
 
-test_bus_objects_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
-
 test_bus_objects_LDADD = \
        libshared.la
 
@@ -3175,14 +3113,14 @@ test_event_SOURCES = \
 test_event_LDADD = \
        libshared.la
 
-test_rtnl_SOURCES = \
-       src/libsystemd/sd-rtnl/test-rtnl.c
+test_netlink_SOURCES = \
+       src/libsystemd/sd-netlink/test-netlink.c
 
-test_rtnl_LDADD = \
+test_netlink_LDADD = \
        libshared.la
 
 test_local_addresses_SOURCES = \
-       src/libsystemd/sd-rtnl/test-local-addresses.c
+       src/libsystemd/sd-netlink/test-local-addresses.c
 
 test_local_addresses_LDADD = \
        libshared.la
@@ -3191,13 +3129,8 @@ test_resolve_SOURCES = \
        src/libsystemd/sd-resolve/test-resolve.c
 
 test_resolve_LDADD = \
-       libsystemd-resolve.la \
        libshared.la
 
-test_resolve_CFLAGS = \
-       $(AM_CFLAGS) \
-       -pthread
-
 busctl_SOURCES = \
        src/libsystemd/sd-bus/busctl.c \
        src/libsystemd/sd-bus/busctl-introspect.c \
@@ -3283,9 +3216,7 @@ test_dhcp_client_SOURCES = \
 
 test_dhcp_client_LDADD = \
        libsystemd-network.la \
-       libudev-internal.la \
-       libshared.la \
-       $(LIBIDN_LIBS)
+       libshared.la
 
 test_dhcp_server_SOURCES = \
        src/libsystemd-network/test-dhcp-server.c
@@ -3371,8 +3302,8 @@ noinst_PROGRAMS += \
        systemd-modeset \
        systemd-subterm
 
-dist_pkgdata_DATA += \
-       src/libsystemd-terminal/unifont-glyph-array.bin
+pkgdata_DATA = \
+       src/libsystemd-terminal/unifont-glyph-array.bin
 
 nodist_userunit_DATA += \
        units/user/systemd-consoled.service
@@ -3418,7 +3349,6 @@ libsystemd_terminal_la_SOURCES = \
        src/libsystemd-terminal/unifont.c
 
 libsystemd_terminal_la_LIBADD = \
-       libudev-internal.la \
        libshared.la \
        $(TERMINAL_LIBS)
 
@@ -3519,10 +3449,6 @@ libudev_la_SOURCES =\
        src/libudev/libudev-queue.c \
        src/libudev/libudev-hwdb.c
 
-libudev_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=hidden
-
 libudev_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
@@ -3554,10 +3480,6 @@ noinst_LTLIBRARIES += \
 libudev_internal_la_SOURCES =\
        $(libudev_la_SOURCES)
 
-libudev_internal_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default
-
 # ------------------------------------------------------------------------------
 INSTALL_DIRS += \
        $(sysconfdir)/udev/rules.d
@@ -3568,7 +3490,6 @@ dist_network_DATA = \
        network/80-container-ve.network
 
 dist_udevrules_DATA += \
-       rules/42-usb-hid-pm.rules \
        rules/50-udev-default.rules \
        rules/60-block.rules \
        rules/60-drm.rules \
@@ -3580,7 +3501,6 @@ dist_udevrules_DATA += \
        rules/60-serial.rules \
        rules/64-btrfs.rules \
        rules/70-mouse.rules \
-       rules/70-touchpad.rules \
        rules/75-net-description.rules \
        rules/78-sound-card.rules \
        rules/80-net-setup-link.rules
@@ -3672,7 +3592,6 @@ libudev_core_la_CFLAGS = \
        $(KMOD_CFLAGS)
 
 libudev_core_la_LIBADD = \
-       libudev-internal.la \
        libsystemd-network.la \
        libshared.la \
        $(BLKID_LIBS) \
@@ -3731,7 +3650,6 @@ systemd_hwdb_SOURCES = \
        src/hwdb/hwdb.c
 
 systemd_hwdb_LDADD = \
-       libudev-internal.la \
        libshared.la
 
 rootbin_PROGRAMS += \
@@ -3751,8 +3669,7 @@ dist_udevhwdb_DATA = \
        hwdb/60-evdev.hwdb \
        hwdb/60-keyboard.hwdb \
        hwdb/70-mouse.hwdb \
-       hwdb/70-pointingstick.hwdb \
-       hwdb/70-touchpad.hwdb
+       hwdb/70-pointingstick.hwdb
 
 SYSINIT_TARGET_WANTS += \
        systemd-hwdb-update.service
@@ -3776,18 +3693,15 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 TESTS += \
-       test/udev-test.pl \
-       $(NULL)
+       test/udev-test.pl
 
 if HAVE_PYTHON
 TESTS += \
-       test/rule-syntax-check.py \
-       $(NULL)
+       test/rule-syntax-check.py
 
 if HAVE_SYSV_COMPAT
 TESTS += \
-       test/sysv-generator-test.py \
-       $(NULL)
+       test/sysv-generator-test.py
 endif
 endif
 
@@ -3799,9 +3713,7 @@ test_libudev_SOURCES = \
        src/test/test-libudev.c
 
 test_libudev_LDADD = \
-       libudev-internal.la \
-       libshared.la \
-       $(ACL_LIBS)
+       libshared.la
 
 test_udev_SOURCES = \
        src/test/test-udev.c
@@ -3809,9 +3721,7 @@ test_udev_SOURCES = \
 test_udev_LDADD = \
        libudev-core.la  \
        $(BLKID_LIBS) \
-       $(KMOD_LIBS) \
-       $(SELINUX_LIBS) \
-       $(ACL_LIBS)
+       $(KMOD_LIBS)
 
 check_DATA += \
        test/sys
@@ -3830,16 +3740,13 @@ EXTRA_DIST += \
        test/udev-test.pl \
        test/rule-syntax-check.py \
        test/sysv-generator-test.py \
-       test/mocks/fsck \
-       $(NULL)
-
+       test/mocks/fsck
 
 # ------------------------------------------------------------------------------
 ata_id_SOURCES = \
        src/udev/ata_id/ata_id.c
 
 ata_id_LDADD = \
-       libudev-internal.la \
        libshared.la
 
 udevlibexec_PROGRAMS += \
@@ -3850,7 +3757,6 @@ cdrom_id_SOURCES = \
        src/udev/cdrom_id/cdrom_id.c
 
 cdrom_id_LDADD = \
-       libudev-internal.la \
        libshared.la
 
 udevlibexec_PROGRAMS += \
@@ -3864,7 +3770,6 @@ collect_SOURCES = \
        src/udev/collect/collect.c
 
 collect_LDADD = \
-       libudev-internal.la \
        libshared.la
 
 udevlibexec_PROGRAMS += \
@@ -3878,7 +3783,6 @@ scsi_id_SOURCES =\
        src/udev/scsi_id/scsi_id.h
 
 scsi_id_LDADD = \
-       libudev-internal.la \
        libshared.la
 
 udevlibexec_PROGRAMS += \
@@ -3892,7 +3796,6 @@ v4l_id_SOURCES = \
        src/udev/v4l_id/v4l_id.c
 
 v4l_id_LDADD = \
-       libudev-internal.la \
        libshared.la
 
 udevlibexec_PROGRAMS += \
@@ -3901,20 +3804,6 @@ udevlibexec_PROGRAMS += \
 dist_udevrules_DATA += \
        rules/60-persistent-v4l.rules
 
-# ------------------------------------------------------------------------------
-accelerometer_SOURCES = \
-       src/udev/accelerometer/accelerometer.c
-
-accelerometer_LDADD = \
-       libudev-internal.la \
-       libshared.la
-
-udevlibexec_PROGRAMS += \
-       accelerometer
-
-dist_udevrules_DATA += \
-       rules/61-accelerometer.rules
-
 # ------------------------------------------------------------------------------
 mtd_probe_SOURCES =  \
        src/udev/mtd_probe/mtd_probe.c \
@@ -4016,7 +3905,6 @@ journal-remote-install-hook: journal-install-hook
        -chmod 755 $(DESTDIR)/var/log/journal/remote
 
 INSTALL_EXEC_HOOKS += journal-remote-install-hook
-
 endif
 
 nodist_pkgsysconf_DATA += \
@@ -4024,8 +3912,8 @@ nodist_pkgsysconf_DATA += \
 
 EXTRA_DIST += \
        units/systemd-journal-remote.service.in \
-       src/journal-remote/journal-remote.conf.in
-
+       src/journal-remote/journal-remote.conf.in \
+       src/journal-remote/log-generator.py
 endif
 
 if HAVE_LIBCURL
@@ -4042,7 +3930,6 @@ systemd_journal_upload_CFLAGS = \
        $(LIBCURL_CFLAGS)
 
 systemd_journal_upload_LDADD = \
-       libsystemd-journal-internal.la \
        libshared.la \
        $(LIBCURL_LIBS)
 
@@ -4051,7 +3938,6 @@ nodist_systemunit_DATA += \
 
 nodist_pkgsysconf_DATA += \
        src/journal-remote/journal-upload.conf
-
 endif
 
 EXTRA_DIST += \
@@ -4066,7 +3952,6 @@ journalctl_SOURCES = \
        src/journal/journalctl.c
 
 journalctl_LDADD = \
-       libsystemd-journal-internal.la \
        libshared.la
 
 if HAVE_QRENCODE
@@ -4161,14 +4046,12 @@ test_compress_SOURCES = \
        src/journal/test-compress.c
 
 test_compress_LDADD = \
-       libsystemd-journal-internal.la \
        libshared.la
 
 test_compress_benchmark_SOURCES = \
        src/journal/test-compress-benchmark.c
 
 test_compress_benchmark_LDADD = \
-       libsystemd-journal-internal.la \
        libshared.la
 
 test_audit_type_SOURCES = \
@@ -4202,8 +4085,6 @@ nodist_libjournal_core_la_SOURCES = \
        src/journal/journald-gperf.c
 
 libjournal_core_la_LIBADD = \
-       libsystemd-journal-internal.la \
-       libudev-internal.la \
        libshared.la
 
 noinst_LTLIBRARIES += \
@@ -4356,11 +4237,14 @@ dist_pkgsysconf_DATA += \
        src/journal/journald.conf
 
 dist_catalog_DATA = \
+       catalog/systemd.be.catalog \
+       catalog/systemd.be@latin.catalog \
        catalog/systemd.fr.catalog \
        catalog/systemd.it.catalog \
        catalog/systemd.pl.catalog \
        catalog/systemd.pt_BR.catalog \
        catalog/systemd.ru.catalog \
+       catalog/systemd.zh_TW.catalog \
        catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \
@@ -4394,7 +4278,6 @@ systemd_journal_gatewayd_SOURCES = \
        src/journal-remote/microhttpd-util.c
 
 systemd_journal_gatewayd_LDADD = \
-       libsystemd-journal-internal.la \
        libshared.la \
        $(MICROHTTPD_LIBS)
 
@@ -4431,9 +4314,7 @@ systemd_socket_proxyd_SOURCES = \
        src/socket-proxy/socket-proxyd.c
 
 systemd_socket_proxyd_LDADD = \
-       libsystemd-journal-internal.la \
-       libshared.la \
-       libsystemd-resolve.la
+       libshared.la
 
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
@@ -4443,7 +4324,6 @@ systemd_coredump_SOURCES = \
        src/journal/coredump-vacuum.h
 
 systemd_coredump_LDADD = \
-       libsystemd-journal-internal.la \
        libshared.la
 
 if HAVE_ELFUTILS
@@ -4465,7 +4345,6 @@ coredumpctl_SOURCES = \
        src/journal/coredumpctl.c
 
 coredumpctl_LDADD = \
-       libsystemd-journal-internal.la \
        libshared.la
 
 bin_PROGRAMS += \
@@ -4565,7 +4444,6 @@ systemd_bootchart_SOURCES = \
        src/bootchart/svg.h
 
 systemd_bootchart_LDADD = \
-       libsystemd-journal-internal.la \
        libshared.la
 
 rootlibexec_PROGRAMS += \
@@ -4636,7 +4514,6 @@ systemd_backlight_SOURCES = \
        src/backlight/backlight.c
 
 systemd_backlight_LDADD = \
-       libudev-internal.la \
        libshared.la
 endif
 
@@ -4655,7 +4532,6 @@ systemd_rfkill_SOURCES = \
        src/rfkill/rfkill.c
 
 systemd_rfkill_LDADD = \
-       libudev-internal.la \
        libshared.la
 endif
 
@@ -4682,7 +4558,6 @@ systemd_cryptsetup_CFLAGS = \
        $(LIBCRYPTSETUP_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
-       libudev-internal.la \
        libshared.la \
        $(LIBCRYPTSETUP_LIBS)
 
@@ -4796,7 +4671,7 @@ SYSTEM_UNIT_ALIASES += \
 BUSNAMES_TARGET_WANTS += \
        org.freedesktop.locale1.busname
 
-dist_pkgdata_DATA += \
+dist_pkgdata_DATA = \
        src/locale/kbd-model-map \
        src/locale/language-fallback-map
 
@@ -4897,7 +4772,6 @@ gperf_gperf_sources += \
        src/timesync/timesyncd-gperf.gperf
 
 systemd_timesyncd_LDADD = \
-       libsystemd-resolve.la \
        libsystemd-network.la \
        libshared.la
 
@@ -4937,7 +4811,6 @@ libnss_myhostname_la_LDFLAGS = \
 
 libnss_myhostname_la_LIBADD = \
        libshared.la
-#libsystemd-network.la
 
 lib_LTLIBRARIES += \
        libnss_myhostname.la
@@ -4965,7 +4838,6 @@ libmachine_core_la_SOURCES = \
        src/machine/image-dbus.h
 
 libmachine_core_la_LIBADD = \
-       libudev-internal.la \
        libshared.la
 
 noinst_LTLIBRARIES += \
@@ -4975,7 +4847,6 @@ machinectl_SOURCES = \
        src/machine/machinectl.c
 
 machinectl_LDADD = \
-       libsystemd-journal-internal.la \
        libshared.la
 
 rootbin_PROGRAMS += \
@@ -5268,8 +5139,7 @@ gperf_txt_sources += \
 
 systemd_resolved_LDADD = \
        libsystemd-network.la \
-       libshared.la \
-       $(LIBIDN_LIBS)
+       libshared.la
 
 rootlibexec_PROGRAMS += \
        systemd-resolved
@@ -5338,8 +5208,7 @@ nodist_systemd_resolve_host_SOURCES = \
        src/resolve/dns_type-to-name.h
 
 systemd_resolve_host_LDADD = \
-       libshared.la \
-       $(LIBIDN_LIBS)
+       libshared.la
 
 rootlibexec_PROGRAMS += \
        systemd-resolve-host
@@ -5358,8 +5227,7 @@ systemd_networkd_SOURCES = \
        src/network/networkd.c
 
 systemd_networkd_LDADD = \
-       libnetworkd-core.la \
-       $(LIBIDN_LIBS)
+       libnetworkd-core.la
 
 if HAVE_LIBIPTC
 systemd_networkd_LDADD += \
@@ -5417,7 +5285,6 @@ nodist_libnetworkd_core_la_SOURCES = \
        src/network/networkd-netdev-gperf.c
 
 libnetworkd_core_la_LIBADD = \
-       libudev-internal.la \
        libsystemd-network.la \
        libshared.la
 
@@ -5437,7 +5304,6 @@ systemd_networkd_wait_online_SOURCES = \
 
 systemd_networkd_wait_online_LDADD = \
        libsystemd-network.la \
-       libudev-internal.la \
        libshared.la
 
 rootbin_PROGRAMS += \
@@ -5447,7 +5313,6 @@ networkctl_SOURCES = \
        src/network/networkctl.c
 
 networkctl_LDADD = \
-       libudev-internal.la \
        libshared.la \
        libsystemd-network.la
 
@@ -5455,8 +5320,7 @@ test_network_SOURCES = \
        src/network/test-network.c
 
 test_network_LDADD = \
-       libnetworkd-core.la \
-       $(LIBIDN_LIBS)
+       libnetworkd-core.la
 
 if HAVE_LIBIPTC
 test_network_LDADD += \
@@ -5554,7 +5418,6 @@ liblogind_core_la_SOURCES = \
        src/login/logind-acl.h
 
 liblogind_core_la_LIBADD = \
-       libudev-internal.la \
        libshared.la
 
 if HAVE_ACL
@@ -5574,8 +5437,6 @@ loginctl_SOURCES = \
        src/login/sysfs-show.c
 
 loginctl_LDADD = \
-       libudev-internal.la \
-       libsystemd-journal-internal.la \
        libshared.la
 
 rootbin_PROGRAMS += \
@@ -5636,8 +5497,7 @@ pam_systemd_la_SOURCES = \
 
 pam_systemd_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(PAM_CFLAGS) \
-       -fvisibility=hidden
+       $(PAM_CFLAGS)
 
 pam_systemd_la_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -5737,163 +5597,28 @@ EXTRA_DIST += \
        units/systemd-user-sessions.service.in
 
 # ------------------------------------------------------------------------------
+EXTRA_DIST += \
+       test/Makefile \
+       test/README.testsuite \
+       test/TEST-01-BASIC \
+       test/TEST-01-BASIC/Makefile \
+       test/TEST-01-BASIC/test.sh \
+       test/TEST-02-CRYPTSETUP \
+       test/TEST-02-CRYPTSETUP/Makefile \
+       test/TEST-02-CRYPTSETUP/test.sh \
+       test/TEST-03-JOBS \
+       test/TEST-03-JOBS/Makefile \
+       test/TEST-03-JOBS/test-jobs.sh \
+       test/TEST-03-JOBS/test.sh \
+       test/test-functions
 
-if HAVE_PYTHON_DEVEL
-pkgpyexec_LTLIBRARIES = \
-       _journal.la \
-       id128.la \
-       _daemon.la \
-       _reader.la \
-       login.la
-
-_journal_la_SOURCES = \
-       src/python-systemd/_journal.c
-
-_journal_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default \
-       $(PYTHON_DEVEL_CFLAGS)
-
-_journal_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -shared \
-       -module \
-       -avoid-version
-
-_journal_la_LIBADD = \
-       $(PYTHON_DEVEL_LIBS) \
-       libsystemd.la
-
-id128_la_SOURCES = \
-       src/python-systemd/id128.c \
-       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 \
-       $(PYTHON_DEVEL_CFLAGS) \
-       -I$(top_builddir)/src/python-systemd
-
-id128_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -shared \
-       -module \
-       -avoid-version
-
-id128_la_LIBADD = \
-       $(PYTHON_DEVEL_LIBS) \
-       libshared.la \
-       libsystemd.la
-
-_daemon_la_SOURCES = \
-       src/python-systemd/_daemon.c \
-       src/python-systemd/pyutil.c \
-       src/python-systemd/pyutil.h
-
-_daemon_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default \
-       $(PYTHON_DEVEL_CFLAGS) \
-       -I$(top_builddir)/src/python-systemd
-
-_daemon_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -shared \
-       -module \
-       -avoid-version
-
-_daemon_la_LIBADD = \
-       $(PYTHON_DEVEL_LIBS) \
-       libshared.la \
-       libsystemd.la
-
-_reader_la_SOURCES = \
-       src/python-systemd/_reader.c \
-       src/python-systemd/pyutil.c \
-       src/python-systemd/pyutil.h
-
-_reader_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default \
-       $(PYTHON_DEVEL_CFLAGS)
-
-_reader_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -shared \
-       -module \
-       -avoid-version
-
-_reader_la_LIBADD = \
-       $(PYTHON_DEVEL_LIBS) \
-       libshared.la \
-       libsystemd.la
-
-login_la_SOURCES = \
-       src/python-systemd/login.c \
-       src/python-systemd/pyutil.c \
-       src/python-systemd/pyutil.h
-
-login_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -fvisibility=default \
-       $(PYTHON_DEVEL_CFLAGS)
-
-login_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -shared \
-       -module \
-       -avoid-version
-
-login_la_LIBADD = \
-       $(PYTHON_DEVEL_LIBS) \
-       libshared.la \
-       libsystemd.la
-
-dist_pkgpyexec_PYTHON = \
-       src/python-systemd/journal.py \
-       src/python-systemd/daemon.py \
-       src/python-systemd/__init__.py
-
-src/python-systemd/id128-constants.h: src/systemd/sd-messages.h
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(SED) -n -r 's/,//g; s/#define (SD_MESSAGE_[A-Z0-9_]+)\s.*/add_id(m, "\1", \1) JOINER/p' <$< >$@
-
-BUILT_SOURCES += \
-       $(nodist_id128_la_SOURCES)
-
-SPHINXOPTS = -D version=$(VERSION) -D release=$(VERSION)
-sphinx-%:
-       $(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
-       $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/
-       $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/docs/html/python-systemd/
-
-python-shell:
-       $(AM_V_at)echo "Starting python with $(DESTDIR)$(pyexecdir)"
-       $(AM_V_at)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(PYTHON)
-
-destdir-sphinx: all
-       dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
-               $(MAKE) DESTDIR="$$dir" install && \
-               $(MAKE) DESTDIR="$$dir" sphinx-html && \
-               rm -rf "$$dir"
-
-endif
-
-CLEAN_LOCAL_HOOKS += clean-sphinx
-
-.PHONY: python-shell destdir-sphinx clean-sphinx clean-python
-
-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
+EXTRA_DIST += \
+       test/loopy2.service \
+       test/loopy3.service \
+       test/loopy4.service \
+       test/loopy.service \
+       test/loopy.service.d \
+       test/loopy.service.d/compat.conf
 
 # ------------------------------------------------------------------------------
 if ENABLE_COMPAT_LIBS
@@ -5907,8 +5632,10 @@ BUILT_SOURCES += \
        libsystemd-id128.c \
        libsystemd-daemon.c
 
+nodist_libsystemd_journal_la_SOURCES = \
+       libsystemd-journal.c
+
 libsystemd_journal_la_SOURCES = \
-       libsystemd-journal.c \
        src/compat-libs/libsystemd-journal.sym
 
 libsystemd_journal_la_CPPFLAGS = \
@@ -5924,8 +5651,10 @@ libsystemd_journal_la_LIBADD = \
        libsystemd-journal-internal.la \
        libsystemd-internal.la
 
+nodist_libsystemd_login_la_SOURCES = \
+       libsystemd-login.c
+
 libsystemd_login_la_SOURCES = \
-       libsystemd-login.c \
        src/compat-libs/libsystemd-login.sym
 
 libsystemd_login_la_CPPFLAGS = \
@@ -5938,10 +5667,12 @@ libsystemd_login_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-login.sym
 
 libsystemd_login_la_LIBADD = \
-       libshared.la
+       libsystemd-internal.la
+
+nodist_libsystemd_id128_la_SOURCES = \
+       libsystemd-id128.c
 
 libsystemd_id128_la_SOURCES = \
-       libsystemd-id128.c \
        src/compat-libs/libsystemd-id128.sym
 
 libsystemd_id128_la_CPPFLAGS = \
@@ -5954,10 +5685,12 @@ libsystemd_id128_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-id128.sym
 
 libsystemd_id128_la_LIBADD = \
-       libshared.la
+       libsystemd-internal.la
+
+nodist_libsystemd_daemon_la_SOURCES = \
+       libsystemd-daemon.c
 
 libsystemd_daemon_la_SOURCES = \
-       libsystemd-daemon.c \
        src/compat-libs/libsystemd-daemon.sym
 
 libsystemd_daemon_la_CPPFLAGS = \
@@ -5970,7 +5703,7 @@ libsystemd_daemon_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-daemon.sym
 
 libsystemd_daemon_la_LIBADD = \
-       libshared.la
+       libsystemd-internal.la
 
 lib_LTLIBRARIES += \
        libsystemd-journal.la \
@@ -6059,13 +5792,13 @@ substitutions = \
        '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
        '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
        '|PYTHON=$(PYTHON)|' \
-       '|PYTHON_BINARY=$(PYTHON_BINARY)|' \
        '|NTP_SERVERS=$(NTP_SERVERS)|' \
        '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
        '|TTY_GID=$(TTY_GID)|' \
        '|systemsleepdir=$(systemsleepdir)|' \
+       '|systemshutdowndir=$(systemshutdowndir)|' \
        '|binfmtdir=$(binfmtdir)|' \
        '|modulesloaddir=$(modulesloaddir)|'
 
@@ -6285,10 +6018,8 @@ USER_UNIT_ALIASES += \
        $(systemunitdir)/sound.target sound.target \
        $(systemunitdir)/smartcard.target smartcard.target
 
-if ENABLE_KDBUS
 USER_UNIT_ALIASES += \
        $(systemunitdir)/busnames.target busnames.target
-endif
 
 GENERAL_ALIASES += \
        $(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
@@ -6349,7 +6080,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-pamconfdir=$$dc_install_base/$(pamconfdir) \
        --with-rootprefix=$$dc_install_base \
-       --enable-kdbus \
        --enable-compat-libs
 
 if HAVE_SYSV_COMPAT
@@ -6362,11 +6092,6 @@ DISTCHECK_CONFIGURE_FLAGS += \
        --with-sysvrcnd-path=
 endif
 
-if HAVE_PYTHON
-DISTCHECK_CONFIGURE_FLAGS += \
-       --with-python
-endif
-
 if ENABLE_SPLIT_USR
 DISTCHECK_CONFIGURE_FLAGS += \
        --enable-split-usr
@@ -6410,24 +6135,19 @@ hwdb-update:
                http://standards.ieee.org/develop/regauth/iab/iab.txt && \
        ./ids-update.pl )
 
-.PHONY: kdbus-update
-kdbus-update:
-       ( cd $(top_srcdir)/src/libsystemd/sd-bus/ && \
-       wget -N https://d-bus.googlecode.com/git/kdbus.h )
-
 .PHONY: git-tag
 git-tag:
        git tag -s "v$(VERSION)" -m "systemd $(VERSION)"
 
+.PHONY: git-tar
+git-tar:
+       git archive --format=tar --prefix=systemd-$(VERSION)/ HEAD | xz > systemd-$(VERSION).tar.xz
+
 www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
-.PHONY: upload
-upload: all check dist
-       scp systemd-$(VERSION).tar.xz $(www_target)
 
 .PHONY: doc-sync
 doc-sync: all destdir-sphinx
        rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
-       rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/
 
 .PHONY: gardel
 gardel: upload
@@ -6459,7 +6179,7 @@ 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))
-       $(AM_V_GEN)cat $^ > $@
+       $(AM_V_GEN)sort -u $^ > $@
 
 .PHONY: check-api-docs
 check-api-docs: exported man
@@ -6524,12 +6244,12 @@ test-libudev-sym.c: \
                src/udev/udev.h
        $(generate-sym-test)
 
-test_libsystemd_sym_SOURCES = \
+nodist_test_libsystemd_sym_SOURCES = \
        test-libsystemd-sym.c
 test_libsystemd_sym_LDADD = \
        libsystemd.la
 
-test_libudev_sym_SOURCES = \
+nodist_test_libudev_sym_SOURCES = \
        test-libudev-sym.c
 test_libudev_sym_CFLAGS = \
        $(AM_CFLAGS) \
@@ -6538,8 +6258,12 @@ test_libudev_sym_LDADD = \
        libudev.la
 
 BUILT_SOURCES += \
-       $(test_libsystemd_sym_SOURCES) \
-       $(test_libudev_sym_SOURCES)
+       test-libsystemd-sym.c \
+       test-libudev-sym.c
+
+CLEANFILES += \
+       test-libsystemd-sym.c \
+       test-libudev-sym.c
 
 tests += \
        test-libsystemd-sym \