]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - Makefile.am
resolved: cache stringified transaction key once per transaction
[thirdparty/systemd.git] / Makefile.am
index 2cf43a5a45351b62b5a81e784de9f7d680c3b66e..00a92e34e03a843e608eec5d1590b9934a624e96 100644 (file)
@@ -42,9 +42,9 @@ LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=11
+LIBSYSTEMD_CURRENT=13
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=11
+LIBSYSTEMD_AGE=13
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
@@ -147,6 +147,7 @@ tests=
 manual_tests =
 TEST_EXTENSIONS = .py
 PY_LOG_COMPILER = $(PYTHON)
+DISABLE_HARD_ERRORS = yes
 if ENABLE_TESTS
 noinst_PROGRAMS = $(manual_tests) $(tests)
 TESTS = $(tests)
@@ -397,7 +398,6 @@ rootlibexec_PROGRAMS = \
        systemd-remount-fs \
        systemd-reply-password \
        systemd-fsck \
-       systemd-machine-id-commit \
        systemd-ac-power \
        systemd-sysctl \
        systemd-sleep \
@@ -427,6 +427,7 @@ dist_bashcompletion_DATA = \
        shell-completion/bash/systemd-delta \
        shell-completion/bash/systemd-detect-virt \
        shell-completion/bash/systemd-nspawn \
+       shell-completion/bash/systemd-path \
        shell-completion/bash/systemd-run \
        shell-completion/bash/udevadm \
        shell-completion/bash/kernel-install
@@ -474,6 +475,7 @@ dist_systemunit_DATA = \
        units/getty.target \
        units/halt.target \
        units/kexec.target \
+       units/exit.target \
        units/local-fs.target \
        units/local-fs-pre.target \
        units/initrd.target \
@@ -550,6 +552,7 @@ nodist_systemunit_DATA = \
        units/systemd-poweroff.service \
        units/systemd-reboot.service \
        units/systemd-kexec.service \
+       units/systemd-exit.service \
        units/systemd-fsck@.service \
        units/systemd-fsck-root.service \
        units/systemd-machine-id-commit.service \
@@ -601,6 +604,7 @@ EXTRA_DIST += \
        units/systemd-poweroff.service.in \
        units/systemd-reboot.service.in \
        units/systemd-kexec.service.in \
+       units/systemd-exit.service.in \
        units/user/systemd-exit.service.in \
        units/systemd-fsck@.service.in \
        units/systemd-fsck-root.service.in \
@@ -614,7 +618,8 @@ EXTRA_DIST += \
        units/initrd-udevadm-cleanup-db.service.in \
        units/initrd-switch-root.service.in \
        units/systemd-nspawn@.service.in \
-       units/systemd-update-done.service.in
+       units/systemd-update-done.service.in \
+    units/tmp.mount.m4
 
 if HAVE_SYSV_COMPAT
 nodist_systemunit_DATA += \
@@ -657,6 +662,7 @@ EXTRA_DIST += \
        README.md \
        autogen.sh \
        .dir-locals.el \
+       .editorconfig \
        .vimrc \
        .ycm_extra_conf.py \
        .travis.yml \
@@ -722,8 +728,8 @@ SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directi
 # 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
+update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB) man/custom-entities.ent
+       $(AM_V_GEN)$(PYTHON) $< $(XML_GLOB) > $(top_srcdir)/Makefile-man.tmp
        $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
        @echo "Makefile-man.am has been regenerated"
 
@@ -739,8 +745,6 @@ CLEANFILES += \
        man/systemd.index.xml \
        man/systemd.directives.xml
 
-EXTRA_DIST += \
-       tools/make-man-rules.py
 
 endif
 
@@ -749,6 +753,7 @@ endif
 EXTRA_DIST += \
        $(filter-out man/systemd.directives.xml man/systemd.index.xml,$(XML_FILES)) \
        tools/make-man-index.py \
+       tools/make-man-rules.py \
        tools/make-directive-index.py \
        tools/xml_helper.py \
        man/glib-event-glue.c
@@ -759,10 +764,13 @@ noinst_LTLIBRARIES += \
 
 libbasic_la_SOURCES = \
        src/basic/missing.h \
-       src/basic/capability.c \
-       src/basic/capability.h \
+       src/basic/capability-util.c \
+       src/basic/capability-util.h \
+       src/basic/c-rbtree.c \
+       src/basic/c-rbtree.h \
        src/basic/conf-files.c \
        src/basic/conf-files.h \
+       src/basic/stdio-util.h \
        src/basic/hostname-util.h \
        src/basic/hostname-util.c \
        src/basic/unit-name.c \
@@ -778,6 +786,44 @@ libbasic_la_SOURCES = \
        src/basic/refcnt.h \
        src/basic/util.c \
        src/basic/util.h \
+       src/basic/io-util.c \
+       src/basic/io-util.h \
+       src/basic/string-util.c \
+       src/basic/string-util.h \
+       src/basic/fd-util.c \
+       src/basic/fd-util.h \
+       src/basic/parse-util.c \
+       src/basic/parse-util.h \
+       src/basic/user-util.c \
+       src/basic/user-util.h \
+       src/basic/rlimit-util.c \
+       src/basic/rlimit-util.h \
+       src/basic/dirent-util.c \
+       src/basic/dirent-util.h \
+       src/basic/xattr-util.c \
+       src/basic/xattr-util.h \
+       src/basic/chattr-util.c \
+       src/basic/chattr-util.h \
+       src/basic/proc-cmdline.c \
+       src/basic/proc-cmdline.h \
+       src/basic/fs-util.c \
+       src/basic/fs-util.h \
+       src/basic/syslog-util.c \
+       src/basic/syslog-util.h \
+       src/basic/stat-util.c \
+       src/basic/stat-util.h \
+       src/basic/mount-util.c \
+       src/basic/mount-util.h \
+       src/basic/hexdecoct.c \
+       src/basic/hexdecoct.h \
+       src/basic/glob-util.h \
+       src/basic/glob-util.c \
+       src/basic/extract-word.c \
+       src/basic/extract-word.h \
+       src/basic/escape.c \
+       src/basic/escape.h \
+       src/basic/cpu-set-util.c \
+       src/basic/cpu-set-util.h \
        src/basic/lockfile-util.c \
        src/basic/lockfile-util.h \
        src/basic/path-util.c \
@@ -786,8 +832,11 @@ libbasic_la_SOURCES = \
        src/basic/time-util.h \
        src/basic/locale-util.c \
        src/basic/locale-util.h \
+       src/basic/umask-util.h \
        src/basic/signal-util.c \
        src/basic/signal-util.h \
+       src/basic/string-table.c \
+       src/basic/string-table.h \
        src/basic/mempool.c \
        src/basic/mempool.h \
        src/basic/hashmap.c \
@@ -802,6 +851,8 @@ libbasic_la_SOURCES = \
        src/basic/fdset.h \
        src/basic/prioq.c \
        src/basic/prioq.h \
+       src/basic/web-util.c \
+       src/basic/web-util.h \
        src/basic/strv.c \
        src/basic/strv.h \
        src/basic/env-util.c \
@@ -833,6 +884,7 @@ libbasic_la_SOURCES = \
        src/basic/in-addr-util.c \
        src/basic/in-addr-util.h \
        src/basic/ether-addr-util.h \
+       src/basic/ether-addr-util.c \
        src/basic/replace-var.c \
        src/basic/replace-var.h \
        src/basic/clock-util.c \
@@ -859,14 +911,12 @@ libbasic_la_SOURCES = \
        src/basic/login-util.c \
        src/basic/cap-list.c \
        src/basic/cap-list.h \
-       src/basic/audit.c \
-       src/basic/audit.h \
+       src/basic/audit-util.c \
+       src/basic/audit-util.h \
        src/basic/xml.c \
        src/basic/xml.h \
        src/basic/json.c \
        src/basic/json.h \
-       src/basic/ring.c \
-       src/basic/ring.h \
        src/basic/barrier.c \
        src/basic/barrier.h \
        src/basic/async.c \
@@ -896,7 +946,11 @@ libbasic_la_SOURCES = \
        src/basic/rm-rf.c \
        src/basic/rm-rf.h \
        src/basic/copy.c \
-       src/basic/copy.h
+       src/basic/copy.h \
+       src/basic/alloc-util.h \
+       src/basic/alloc-util.c \
+       src/basic/formats-util.h \
+       src/basic/nss-util.h
 
 nodist_libbasic_la_SOURCES = \
        src/basic/errno-from-name.h \
@@ -917,7 +971,6 @@ libbasic_la_CFLAGS = \
 libbasic_la_LIBADD = \
        $(SELINUX_LIBS) \
        $(CAP_LIBS) \
-       -ldl \
        -lrt \
        -lm
 
@@ -937,7 +990,6 @@ libshared_la_SOURCES = \
        src/shared/architecture.h \
        src/shared/efivars.c \
        src/shared/efivars.h \
-       src/shared/formats-util.h \
        src/shared/fstab-util.c \
        src/shared/fstab-util.h \
        src/shared/sleep-config.c \
@@ -954,13 +1006,10 @@ libshared_la_SOURCES = \
        src/shared/ima-util.h \
        src/shared/ptyfwd.c \
        src/shared/ptyfwd.h \
-       src/shared/pty.c \
-       src/shared/pty.h \
        src/shared/base-filesystem.c \
        src/shared/base-filesystem.h \
        src/shared/uid-range.c \
        src/shared/uid-range.h \
-       src/shared/nss-util.h \
        src/shared/install.c \
        src/shared/install.h \
        src/shared/install-printf.c \
@@ -1093,8 +1142,6 @@ libcore_la_SOURCES = \
        src/core/bus-policy.h \
        src/core/target.c \
        src/core/target.h \
-       src/core/snapshot.c \
-       src/core/snapshot.h \
        src/core/device.c \
        src/core/device.h \
        src/core/mount.c \
@@ -1133,8 +1180,6 @@ libcore_la_SOURCES = \
        src/core/dbus-busname.h \
        src/core/dbus-target.c \
        src/core/dbus-target.h \
-       src/core/dbus-snapshot.c \
-       src/core/dbus-snapshot.h \
        src/core/dbus-device.c \
        src/core/dbus-device.h \
        src/core/dbus-mount.c \
@@ -1229,7 +1274,7 @@ BUILT_SOURCES += \
        $(gperf_gperf_m4_sources:-gperf.gperf.m4=-gperf-nulstr.c) \
        $(gperf_gperf_sources:-gperf.gperf=-gperf.c) \
        $(gperf_txt_sources:-list.txt=-from-name.h) \
-       $(gperf_txt_sources:-list.txt=-to-name.h)
+       $(filter-out %keyboard-keys-to-name.h,$(gperf_txt_sources:-list.txt=-to-name.h))
 
 CLEANFILES += \
        $(gperf_txt_sources:-list.txt=-from-name.gperf)
@@ -1331,7 +1376,8 @@ systemd_SOURCES = \
 
 systemd_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 systemd_LDADD = \
        libcore.la
@@ -1357,7 +1403,8 @@ nodist_rpmmacros_DATA = \
 
 EXTRA_DIST += \
        src/core/systemd.pc.in \
-       src/core/macros.systemd.in
+       src/core/macros.systemd.in \
+       src/core/triggers.systemd.in
 
 # ------------------------------------------------------------------------------
 
@@ -1371,7 +1418,9 @@ manual_tests += \
        test-watchdog \
        test-log \
        test-ipcrm \
-       test-btrfs
+       test-btrfs \
+       test-acd \
+       test-ipv4ll-manual
 
 if HAVE_LIBIPTC
 manual_tests += \
@@ -1393,18 +1442,21 @@ tests += \
        test-path \
        test-path-util \
        test-strxcpyx \
+       test-siphash24 \
        test-unit-name \
        test-unit-file \
        test-utf8 \
        test-ellipsize \
        test-util \
+       test-string-util \
+       test-extract-word \
+       test-parse-util \
+       test-user-util \
        test-hostname-util \
        test-process-util \
        test-terminal-util \
        test-path-lookup \
-       test-ring \
        test-barrier \
-       test-pty \
        test-tmpfiles \
        test-namespace \
        test-date \
@@ -1443,10 +1495,18 @@ tests += \
        test-copy \
        test-cap-list \
        test-sigbus \
+       test-rbtree \
        test-verbs \
        test-af-list \
        test-arphrd-list \
-       test-dns-domain
+       test-dns-domain \
+       test-install-root \
+       test-rlimit-util
+
+if HAVE_ACL
+tests += \
+       test-acl-util
+endif
 
 EXTRA_DIST += \
        test/a.service \
@@ -1455,7 +1515,7 @@ EXTRA_DIST += \
        test/c.service \
        test/daughter.service \
        test/d.service \
-       test/end.service.in \
+       test/end.service \
        test/e.service \
        test/f.service \
        test/grandchild.service \
@@ -1465,7 +1525,6 @@ EXTRA_DIST += \
        test/h.service \
        test/parent-deep.slice \
        test/parent.slice \
-       test/paths.target \
        test/sched_idle_bad.service \
        test/sched_idle_ok.service \
        test/sched_rr_bad.service \
@@ -1479,42 +1538,62 @@ EXTRA_DIST += \
        test/testsuite.target \
        test/timers.target \
        test/unstoppable.service \
-       test/path-changed.service \
-       test/path-directorynotempty.service \
-       test/path-existsglob.service \
-       test/path-exists.service \
-       test/path-makedirectory.service \
-       test/path-modified.service \
-       test/path-mycustomunit.service \
-       test/path-service.service \
-       test/path-changed.path \
-       test/path-directorynotempty.path \
-       test/path-existsglob.path \
-       test/path-exists.path \
-       test/path-makedirectory.path \
-       test/path-modified.path \
-       test/path-unit.path \
-       test/exec-environment-empty.service \
-       test/exec-environment-multiple.service \
-       test/exec-environment.service \
-       test/exec-group.service \
-       test/exec-ignoresigpipe-no.service \
-       test/exec-ignoresigpipe-yes.service \
-       test/exec-personality-x86-64.service \
-       test/exec-personality-x86.service \
-       test/exec-privatedevices-no.service \
-       test/exec-privatedevices-yes.service \
-       test/exec-privatetmp-no.service \
-       test/exec-privatetmp-yes.service \
-       test/exec-systemcallerrornumber.service \
-       test/exec-systemcallfilter-failing2.service \
-       test/exec-systemcallfilter-failing.service \
-       test/exec-systemcallfilter-not-failing2.service \
-       test/exec-systemcallfilter-not-failing.service \
-       test/exec-user.service \
-       test/exec-workingdirectory.service \
-       test/exec-umask-0177.service \
-       test/exec-umask-default.service \
+       test/test-path/paths.target \
+       test/test-path/basic.target \
+       test/test-path/sysinit.target \
+       test/test-path/path-changed.service \
+       test/test-path/path-directorynotempty.service \
+       test/test-path/path-existsglob.service \
+       test/test-path/path-exists.service \
+       test/test-path/path-makedirectory.service \
+       test/test-path/path-modified.service \
+       test/test-path/path-mycustomunit.service \
+       test/test-path/path-service.service \
+       test/test-path/path-changed.path \
+       test/test-path/path-directorynotempty.path \
+       test/test-path/path-existsglob.path \
+       test/test-path/path-exists.path \
+       test/test-path/path-makedirectory.path \
+       test/test-path/path-modified.path \
+       test/test-path/path-unit.path \
+       test/test-execute/exec-environment-empty.service \
+       test/test-execute/exec-environment-multiple.service \
+       test/test-execute/exec-environment.service \
+       test/test-execute/exec-passenvironment-absent.service \
+       test/test-execute/exec-passenvironment-empty.service \
+       test/test-execute/exec-passenvironment-repeated.service \
+       test/test-execute/exec-passenvironment.service \
+       test/test-execute/exec-group.service \
+       test/test-execute/exec-ignoresigpipe-no.service \
+       test/test-execute/exec-ignoresigpipe-yes.service \
+       test/test-execute/exec-personality-x86-64.service \
+       test/test-execute/exec-personality-x86.service \
+       test/test-execute/exec-personality-s390.service \
+       test/test-execute/exec-privatedevices-no.service \
+       test/test-execute/exec-privatedevices-yes.service \
+       test/test-execute/exec-privatetmp-no.service \
+       test/test-execute/exec-privatetmp-yes.service \
+       test/test-execute/exec-systemcallerrornumber.service \
+       test/test-execute/exec-systemcallfilter-failing2.service \
+       test/test-execute/exec-systemcallfilter-failing.service \
+       test/test-execute/exec-systemcallfilter-not-failing2.service \
+       test/test-execute/exec-systemcallfilter-not-failing.service \
+       test/test-execute/exec-user.service \
+       test/test-execute/exec-workingdirectory.service \
+       test/test-execute/exec-umask-0177.service \
+       test/test-execute/exec-umask-default.service \
+       test/test-execute/exec-privatenetwork-yes.service \
+       test/test-execute/exec-environmentfile.service \
+       test/test-execute/exec-oomscoreadjust-positive.service \
+       test/test-execute/exec-oomscoreadjust-negative.service \
+       test/test-execute/exec-ioschedulingclass-best-effort.service \
+       test/test-execute/exec-ioschedulingclass-idle.service \
+       test/test-execute/exec-ioschedulingclass-none.service \
+       test/test-execute/exec-ioschedulingclass-realtime.service \
+       test/test-execute/exec-capabilityboundingset-invert.service \
+       test/test-execute/exec-capabilityboundingset-merge.service \
+       test/test-execute/exec-capabilityboundingset-reset.service \
+       test/test-execute/exec-capabilityboundingset-simple.service \
        test/bus-policy/hello.conf \
        test/bus-policy/methods.conf \
        test/bus-policy/ownerships.conf \
@@ -1538,7 +1617,8 @@ test_engine_SOURCES = \
 
 test_engine_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_engine_LDADD = \
        libcore.la
@@ -1548,7 +1628,8 @@ test_job_type_SOURCES = \
 
 test_job_type_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_job_type_LDADD = \
        libcore.la
@@ -1598,7 +1679,8 @@ test_unit_name_SOURCES = \
 
 test_unit_name_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_unit_name_LDADD = \
        libcore.la
@@ -1608,7 +1690,8 @@ test_unit_file_SOURCES = \
 
 test_unit_file_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_unit_file_LDADD = \
        libcore.la
@@ -1649,6 +1732,12 @@ test_sigbus_SOURCES = \
 test_sigbus_LDADD = \
        libshared.la
 
+test_rbtree_SOURCES = \
+       src/test/test-rbtree.c
+
+test_rbtree_LDADD = \
+       libshared.la
+
 test_condition_SOURCES = \
        src/test/test-condition.c
 
@@ -1679,6 +1768,30 @@ test_util_SOURCES = \
 test_util_LDADD = \
        libshared.la
 
+test_string_util_SOURCES = \
+       src/test/test-string-util.c
+
+test_string_util_LDADD = \
+       libshared.la
+
+test_extract_word_SOURCES = \
+       src/test/test-extract-word.c
+
+test_extract_word_LDADD = \
+       libshared.la
+
+test_parse_util_SOURCES = \
+       src/test/test-parse-util.c
+
+test_parse_util_LDADD = \
+       libshared.la
+
+test_user_util_SOURCES = \
+       src/test/test-user-util.c
+
+test_user_util_LDADD = \
+       libshared.la
+
 test_hostname_util_SOURCES = \
        src/test/test-hostname-util.c
 
@@ -1721,24 +1834,12 @@ test_socket_util_SOURCES = \
 test_socket_util_LDADD = \
        libshared.la
 
-test_ring_SOURCES = \
-       src/test/test-ring.c
-
-test_ring_LDADD = \
-       libshared.la
-
 test_barrier_SOURCES = \
        src/test/test-barrier.c
 
 test_barrier_LDADD = \
        libshared.la
 
-test_pty_SOURCES = \
-       src/test/test-pty.c
-
-test_pty_LDADD = \
-       libcore.la
-
 test_tmpfiles_SOURCES = \
        src/test/test-tmpfiles.c
 
@@ -1754,9 +1855,27 @@ test_verbs_SOURCES = \
 test_verbs_LDADD = \
        libshared.la
 
+test_install_root_SOURCES = \
+       src/test/test-install-root.c
+
+test_install_root_LDADD = \
+       libshared.la
+
+test_acl_util_SOURCES = \
+       src/test/test-acl-util.c
+
+test_acl_util_LDADD = \
+       libshared.la
+
 test_namespace_LDADD = \
        libcore.la
 
+test_rlimit_util_SOURCES = \
+       src/test/test-rlimit-util.c
+
+test_rlimit_util_LDADD = \
+       libshared.la
+
 BUILT_SOURCES += \
        src/test/test-hashmap-ordered.c
 
@@ -1829,7 +1948,8 @@ test_tables_CPPFLAGS = \
 
 test_tables_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_tables_LDADD = \
        libjournal-core.la \
@@ -1955,7 +2075,8 @@ test_cgroup_mask_SOURCES = \
        src/test/test-cgroup-mask.c
 
 test_cgroup_mask_CPPFLAGS = \
-       $(AM_CPPFLAGS)
+       $(AM_CPPFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_cgroup_mask_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1998,7 +2119,8 @@ test_path_SOURCES = \
        src/test/test-path.c
 
 test_path_CFLAGS = \
-       $(AM_CFLAGS)
+       $(AM_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_path_LDADD = \
        libcore.la
@@ -2007,11 +2129,18 @@ test_execute_SOURCES = \
        src/test/test-execute.c
 
 test_execute_CFLAGS = \
-       $(AM_CFLAGS)
+       $(AM_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_execute_LDADD = \
        libcore.la
 
+test_siphash24_SOURCES = \
+       src/test/test-siphash24.c
+
+test_siphash24_LDADD = \
+       libshared.la
+
 test_strxcpyx_SOURCES = \
        src/test/test-strxcpyx.c
 
@@ -2034,7 +2163,8 @@ test_sched_prio_SOURCES = \
        src/test/test-sched-prio.c
 
 test_sched_prio_CPPFLAGS = \
-       $(AM_CPPFLAGS)
+       $(AM_CPPFLAGS) \
+       $(MOUNT_CFLAGS)
 
 test_sched_prio_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2121,7 +2251,8 @@ systemd_analyze_SOURCES = \
 
 systemd_analyze_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS)
 
 systemd_analyze_LDADD = \
        libcore.la
@@ -2282,6 +2413,11 @@ nodist_sysusers_DATA = \
        sysusers.d/systemd.conf \
        sysusers.d/basic.conf
 
+if HAVE_REMOTE
+nodist_sysusers_DATA += \
+       sysusers.d/systemd-remote.conf
+endif
+
 INSTALL_DIRS += \
        $(sysusersdir)
 endif
@@ -2289,6 +2425,7 @@ endif
 EXTRA_DIST += \
        units/systemd-sysusers.service.in \
        sysusers.d/systemd.conf.m4 \
+       sysusers.d/systemd-remote.conf.m4 \
        sysusers.d/basic.conf.in
 
 # ------------------------------------------------------------------------------
@@ -2332,6 +2469,9 @@ systemd_machine_id_setup_SOURCES = \
 systemd_machine_id_setup_LDADD = \
        libshared.la
 
+SYSINIT_TARGET_WANTS += \
+       systemd-machine-id-commit.service
+
 # ------------------------------------------------------------------------------
 systemd_sysctl_SOURCES = \
        src/sysctl/sysctl.c
@@ -2353,18 +2493,6 @@ systemd_fsck_SOURCES = \
 systemd_fsck_LDADD = \
        libshared.la
 
-# ------------------------------------------------------------------------------
-systemd_machine_id_commit_SOURCES = \
-       src/machine-id-commit/machine-id-commit.c \
-       src/core/machine-id-setup.c \
-       src/core/machine-id-setup.h
-
-systemd_machine_id_commit_LDADD = \
-       libshared.la
-
-SYSINIT_TARGET_WANTS += \
-       systemd-machine-id-commit.service
-
 # ------------------------------------------------------------------------------
 systemd_ac_power_SOURCES = \
        src/ac-power/ac-power.c
@@ -2946,7 +3074,6 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-bus/bus-dump.h \
        src/libsystemd/sd-utf8/sd-utf8.c \
        src/libsystemd/sd-event/sd-event.c \
-       src/libsystemd/sd-event/event-util.h \
        src/libsystemd/sd-netlink/sd-netlink.c \
        src/libsystemd/sd-netlink/netlink-internal.h \
        src/libsystemd/sd-netlink/netlink-message.c \
@@ -2975,8 +3102,7 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-device/sd-device.c \
        src/libsystemd/sd-device/device-private.c \
        src/libsystemd/sd-device/device-private.h \
-       src/libsystemd/sd-resolve/sd-resolve.c \
-       src/libsystemd/sd-resolve/resolve-util.h
+       src/libsystemd/sd-resolve/sd-resolve.c
 
 libsystemd_internal_la_LIBADD = \
        libbasic.la \
@@ -3216,10 +3342,10 @@ libsystemd_network_la_SOURCES = \
        src/systemd/sd-dhcp-server.h \
        src/systemd/sd-dhcp-lease.h \
        src/systemd/sd-ipv4ll.h \
-       src/systemd/sd-icmp6-nd.h \
+       src/systemd/sd-ipv4acd.h \
+       src/systemd/sd-ndisc.h \
        src/systemd/sd-dhcp6-client.h \
        src/systemd/sd-dhcp6-lease.h \
-       src/systemd/sd-pppoe.h \
        src/systemd/sd-lldp.h \
        src/libsystemd-network/sd-dhcp-client.c \
        src/libsystemd-network/sd-dhcp-server.c \
@@ -3232,13 +3358,14 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/dhcp-lease-internal.h \
        src/libsystemd-network/sd-dhcp-lease.c \
        src/libsystemd-network/sd-ipv4ll.c \
-       src/libsystemd-network/ipv4ll-network.c \
-       src/libsystemd-network/ipv4ll-packet.c \
-       src/libsystemd-network/ipv4ll-internal.h \
-       src/libsystemd-network/sd-pppoe.c \
+       src/libsystemd-network/sd-ipv4acd.c \
+       src/libsystemd-network/arp-util.h \
+       src/libsystemd-network/arp-util.c \
        src/libsystemd-network/network-internal.c \
        src/libsystemd-network/network-internal.h \
-       src/libsystemd-network/sd-icmp6-nd.c \
+       src/libsystemd-network/sd-ndisc.c \
+       src/libsystemd-network/icmp6-util.h \
+       src/libsystemd-network/icmp6-util.c \
        src/libsystemd-network/sd-dhcp6-client.c \
        src/libsystemd-network/dhcp6-internal.h \
        src/libsystemd-network/dhcp6-protocol.h \
@@ -3257,7 +3384,6 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/lldp-port.c \
        src/libsystemd-network/lldp-internal.h \
        src/libsystemd-network/lldp-internal.c \
-       src/libsystemd-network/lldp-util.h \
        src/libsystemd-network/sd-lldp.c
 
 libsystemd_network_la_LIBADD = \
@@ -3291,30 +3417,38 @@ test_dhcp_server_LDADD = \
 
 test_ipv4ll_SOURCES = \
        src/systemd/sd-ipv4ll.h \
-       src/libsystemd-network/ipv4ll-internal.h \
+       src/libsystemd-network/arp-util.h \
        src/libsystemd-network/test-ipv4ll.c
 
 test_ipv4ll_LDADD = \
        libsystemd-network.la \
        libshared.la
 
-test_pppoe_SOURCES = \
-       src/systemd/sd-pppoe.h \
-       src/libsystemd-network/test-pppoe.c
+test_ipv4ll_manual_SOURCES = \
+       src/systemd/sd-ipv4ll.h \
+       src/libsystemd-network/test-ipv4ll-manual.c
 
-test_pppoe_LDADD = \
+test_ipv4ll_manual_LDADD = \
        libsystemd-network.la \
        libshared.la
 
-test_icmp6_rs_SOURCES = \
+test_acd_SOURCES = \
+       src/systemd/sd-ipv4acd.h \
+       src/libsystemd-network/test-acd.c
+
+test_acd_LDADD = \
+       libsystemd-network.la \
+       libshared.la
+
+test_ndisc_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 \
+       src/systemd/sd-ndisc.h \
+       src/libsystemd-network/icmp6-util.h \
+       src/libsystemd-network/test-ndisc-rs.c \
        src/libsystemd-network/dhcp-identifier.h \
        src/libsystemd-network/dhcp-identifier.c
 
-test_icmp6_rs_LDADD = \
+test_ndisc_rs_LDADD = \
        libsystemd-network.la \
        libudev.la \
        libshared.la
@@ -3346,13 +3480,10 @@ tests += \
        test-dhcp-client \
        test-dhcp-server \
        test-ipv4ll \
-       test-icmp6-rs \
+       test-ndisc-rs \
        test-dhcp6-client \
        test-lldp
 
-manual_tests += \
-       test-pppoe
-
 # ------------------------------------------------------------------------------
 include_HEADERS += \
        src/libudev/libudev.h
@@ -3468,7 +3599,7 @@ noinst_LTLIBRARIES += \
 
 src/udev/keyboard-keys-list.txt:
        $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@
 
 src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@
@@ -3476,9 +3607,6 @@ src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt
 src/udev/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf
        $(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@
 
-src/udev/keyboard-keys-to-name.h: src/udev/keyboard-keys-list.txt
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
-
 gperf_txt_sources += \
        src/udev/keyboard-keys-list.txt
 
@@ -3505,7 +3633,6 @@ libudev_core_la_SOURCES = \
 
 nodist_libudev_core_la_SOURCES = \
        src/udev/keyboard-keys-from-name.h \
-       src/udev/keyboard-keys-to-name.h \
        src/udev/net/link-config-gperf.c
 
 gperf_gperf_sources += \
@@ -3617,6 +3744,7 @@ EXTRA_DIST += \
        hwdb/sdio.ids
 
 # ------------------------------------------------------------------------------
+if ENABLE_TESTS
 TESTS += \
        test/udev-test.pl
 
@@ -3629,6 +3757,7 @@ TESTS += \
        test/sysv-generator-test.py
 endif
 endif
+endif
 
 manual_tests += \
        test-libudev \
@@ -3648,8 +3777,10 @@ test_udev_LDADD = \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
 
+if ENABLE_TESTS
 check_DATA += \
        test/sys
+endif
 
 # packed sysfs test tree
 test/sys:
@@ -3803,11 +3934,6 @@ systemd_journal_remote_CFLAGS = \
 systemd_journal_remote_LDADD += \
        $(MICROHTTPD_LIBS)
 
-if ENABLE_SYSUSERS
-dist_sysusers_DATA += \
-       sysusers.d/systemd-remote.conf
-endif
-
 if ENABLE_TMPFILES
 dist_tmpfiles_DATA += \
        tmpfiles.d/systemd-remote.conf
@@ -3816,6 +3942,7 @@ endif
 if HAVE_GNUTLS
 systemd_journal_remote_LDADD += \
        $(GNUTLS_LIBS)
+endif
 
 # systemd-journal-remote make sense mostly with full crypto stack
 dist_systemunit_DATA += \
@@ -3830,7 +3957,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 += \
        src/journal-remote/journal-remote.conf
@@ -4169,6 +4295,7 @@ dist_catalog_DATA = \
        catalog/systemd.pl.catalog \
        catalog/systemd.pt_BR.catalog \
        catalog/systemd.ru.catalog \
+       catalog/systemd.zh_CN.catalog \
        catalog/systemd.zh_TW.catalog \
        catalog/systemd.catalog
 
@@ -4455,7 +4582,10 @@ rootlibexec_PROGRAMS += \
        systemd-rfkill
 
 nodist_systemunit_DATA += \
-       units/systemd-rfkill@.service
+       units/systemd-rfkill.service
+
+dist_systemunit_DATA += \
+       units/systemd-rfkill.socket
 
 systemd_rfkill_SOURCES = \
        src/rfkill/rfkill.c
@@ -4465,7 +4595,7 @@ systemd_rfkill_LDADD = \
 endif
 
 EXTRA_DIST += \
-       units/systemd-rfkill@.service.in
+       units/systemd-rfkill.service.in
 
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
@@ -4707,9 +4837,6 @@ systemd_timesyncd_SOURCES = \
 nodist_systemd_timesyncd_SOURCES = \
        src/timesync/timesyncd-gperf.c
 
-gperf_gperf_sources += \
-       src/timesync/timesyncd-gperf.gperf
-
 systemd_timesyncd_LDADD = \
        libsystemd-network.la \
        libshared.la
@@ -4723,15 +4850,18 @@ nodist_systemunit_DATA += \
 GENERAL_ALIASES += \
        $(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/sysinit.target.wants/systemd-timesyncd.service
 
-EXTRA_DIST += \
-       units/systemd-timesyncd.service.in
 
 nodist_pkgsysconf_DATA += \
        src/timesync/timesyncd.conf
 
+endif
+
+gperf_gperf_sources += \
+       src/timesync/timesyncd-gperf.gperf
+
 EXTRA_DIST += \
+       units/systemd-timesyncd.service.in \
        src/timesync/timesyncd.conf.in
-endif
 
 # ------------------------------------------------------------------------------
 if HAVE_MYHOSTNAME
@@ -4895,8 +5025,6 @@ systemd_pull_SOURCES = \
        src/import/pull-raw.h \
        src/import/pull-tar.c \
        src/import/pull-tar.h \
-       src/import/pull-dkr.c \
-       src/import/pull-dkr.h \
        src/import/pull-job.c \
        src/import/pull-job.h \
        src/import/pull-common.c \
@@ -5027,24 +5155,29 @@ polkitpolicy_in_files += \
        src/import/org.freedesktop.import1.policy.in
 
 EXTRA_DIST += \
-       units/systemd-importd.service.in \
-       src/resolve/resolved.conf.in
+       units/systemd-importd.service.in
 
 
 # ------------------------------------------------------------------------------
 if ENABLE_RESOLVED
+if HAVE_GCRYPT
+
 systemd_resolved_SOURCES = \
        src/resolve/resolved.c \
        src/resolve/resolved-manager.c \
        src/resolve/resolved-manager.h \
        src/resolve/resolved-conf.c \
        src/resolve/resolved-conf.h \
+       src/resolve/resolved-resolv-conf.c \
+       src/resolve/resolved-resolv-conf.h \
        src/resolve/resolved-bus.c \
        src/resolve/resolved-bus.h \
        src/resolve/resolved-link.h \
        src/resolve/resolved-link.c \
        src/resolve/resolved-llmnr.h \
        src/resolve/resolved-llmnr.c \
+       src/resolve/resolved-mdns.h \
+       src/resolve/resolved-mdns.c \
        src/resolve/resolved-def.h \
        src/resolve/resolved-dns-rr.h \
        src/resolve/resolved-dns-rr.c \
@@ -5062,12 +5195,18 @@ systemd_resolved_SOURCES = \
        src/resolve/resolved-dns-scope.c \
        src/resolve/resolved-dns-server.h \
        src/resolve/resolved-dns-server.c \
+       src/resolve/resolved-dns-search-domain.h \
+       src/resolve/resolved-dns-search-domain.c \
        src/resolve/resolved-dns-cache.h \
        src/resolve/resolved-dns-cache.c \
        src/resolve/resolved-dns-zone.h \
        src/resolve/resolved-dns-zone.c \
        src/resolve/resolved-dns-stream.h \
        src/resolve/resolved-dns-stream.c \
+       src/resolve/resolved-dns-dnssec.h \
+       src/resolve/resolved-dns-dnssec.c \
+       src/resolve/resolved-dns-trust-anchor.h \
+       src/resolve/resolved-dns-trust-anchor.c \
        src/resolve/dns-type.c \
        src/resolve/dns-type.h
 
@@ -5076,12 +5215,6 @@ nodist_systemd_resolved_SOURCES = \
        src/resolve/dns_type-to-name.h \
        src/resolve/resolved-gperf.c
 
-gperf_gperf_sources += \
-       src/resolve/resolved-gperf.gperf
-
-gperf_txt_sources += \
-       src/resolve/dns_type-list.txt
-
 systemd_resolved_LDADD = \
        libsystemd-network.la \
        libshared.la
@@ -5113,9 +5246,6 @@ GENERAL_ALIASES += \
 nodist_pkgsysconf_DATA += \
        src/resolve/resolved.conf
 
-tests += \
-       test-dns-domain
-
 libnss_resolve_la_SOURCES = \
        src/nss-resolve/nss-resolve.sym \
        src/nss-resolve/nss-resolve.c
@@ -5130,7 +5260,8 @@ libnss_resolve_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/nss-resolve/nss-resolve.sym
 
 libnss_resolve_la_LIBADD = \
-       libshared.la
+       libshared.la \
+        -ldl
 
 lib_LTLIBRARIES += \
        libnss_resolve.la
@@ -5158,10 +5289,40 @@ systemd_resolve_host_LDADD = \
 rootlibexec_PROGRAMS += \
        systemd-resolve-host
 
+tests += \
+       test-dns-domain \
+       test-dnssec
+
+test_dnssec_SOURCES = \
+       src/resolve/test-dnssec.c \
+       src/resolve/resolved-dns-packet.c \
+       src/resolve/resolved-dns-packet.h \
+       src/resolve/resolved-dns-rr.c \
+       src/resolve/resolved-dns-rr.h \
+       src/resolve/resolved-dns-answer.c \
+       src/resolve/resolved-dns-answer.h \
+       src/resolve/resolved-dns-question.c \
+       src/resolve/resolved-dns-question.h \
+       src/resolve/resolved-dns-dnssec.c \
+       src/resolve/resolved-dns-dnssec.h \
+       src/resolve/dns-type.c \
+       src/resolve/dns-type.h
+
+test_dnssec_LDADD = \
+       libshared.la
+
+endif
 endif
 
+gperf_txt_sources += \
+       src/resolve/dns_type-list.txt
+
+gperf_gperf_sources += \
+       src/resolve/resolved-gperf.gperf
+
 EXTRA_DIST += \
-       units/systemd-resolved.service.m4.in
+       units/systemd-resolved.service.m4.in \
+       src/resolve/resolved.conf.in
 
 # ------------------------------------------------------------------------------
 if ENABLE_NETWORKD
@@ -5216,6 +5377,7 @@ libnetworkd_core_la_SOURCES = \
        src/network/networkd-ipv4ll.c \
        src/network/networkd-dhcp4.c \
        src/network/networkd-dhcp6.c \
+       src/network/networkd-ndisc.c \
        src/network/networkd-network.h \
        src/network/networkd-network.c \
        src/network/networkd-network-bus.c \
@@ -5328,14 +5490,16 @@ SYSTEM_UNIT_ALIASES += \
 BUSNAMES_TARGET_WANTS += \
        org.freedesktop.network1.busname
 
+endif
+
 gperf_gperf_sources += \
        src/network/networkd-network-gperf.gperf \
        src/network/networkd-netdev-gperf.gperf
-endif
 
 EXTRA_DIST += \
        units/systemd-networkd.service.m4.in \
-       units/systemd-networkd-wait-online.service.in
+       units/systemd-networkd-wait-online.service.in \
+       test/networkd-test.py
 
 # ------------------------------------------------------------------------------
 if ENABLE_LOGIND
@@ -5478,6 +5642,8 @@ pamlib_LTLIBRARIES = \
 dist_pamconf_DATA = \
        src/login/systemd-user
 
+EXTRA_DIST += \
+       src/login/systemd-user.m4
 endif
 
 nodist_systemunit_DATA += \
@@ -5571,6 +5737,12 @@ EXTRA_DIST += \
        test/TEST-03-JOBS/Makefile \
        test/TEST-03-JOBS/test-jobs.sh \
        test/TEST-03-JOBS/test.sh \
+       test/TEST-04-JOURNAL/Makefile \
+       test/TEST-04-JOURNAL/test-journal.sh \
+       test/TEST-04-JOURNAL/test.sh \
+       test/TEST-05-RLIMITS/Makefile \
+       test/TEST-05-RLIMITS/test-rlimits.sh \
+       test/TEST-05-RLIMITS/test.sh \
        test/test-functions
 
 EXTRA_DIST += \
@@ -5783,7 +5955,7 @@ sysctl.d/%: sysctl.d/%.in
 %.conf: %.conf.in
        $(SED_PROCESS)
 
-src/core/macros.%: src/core/macros.%.in
+src/core/%.systemd: src/core/%.systemd.in
        $(SED_PROCESS)
 
 src/%.policy.in: src/%.policy.in.in
@@ -6061,21 +6233,7 @@ DISTCHECK_CONFIGURE_FLAGS += \
        --disable-split-usr
 endif
 
-#
-# Require python when making dist
-#
-.PHONY: dist-check-python dist-check-compat-libs dist-check-help
-dist-check-python:
-if !HAVE_PYTHON
-       @echo "*** python and python-lxml module must be installed and enabled in order to make dist"
-       @false
-endif
-
-dist-check-compat-libs:
-if !ENABLE_COMPAT_LIBS
-       @echo "*** compat-libs must be enabled in order to make dist"
-       @false
-endif
+.PHONY: dist-check-help
 
 dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
        for i in $(abspath $^); do                                             \
@@ -6085,16 +6243,14 @@ dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
                exit 1;                                                        \
             fi; done
 
-dist: dist-check-python dist-check-compat-libs
-
 .PHONY: hwdb-update
 hwdb-update:
        ( cd $(top_srcdir)/hwdb && \
        wget -O usb.ids 'http://www.linux-usb.org/usb.ids' && \
        wget -O pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids' && \
-       wget -O ma-large.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-L&format=txt' && \
-       wget -O ma-medium.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-M&format=txt' && \
-       wget -O ma-small.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-S&format=txt' && \
+       wget -O ma-large.txt 'http://standards.ieee.org/develop/regauth/oui/oui.txt' && \
+       wget -O ma-medium.txt 'http://standards.ieee.org/develop/regauth/oui28/mam.txt' && \
+       wget -O ma-small.txt 'http://standards.ieee.org/develop/regauth/oui36/oui36.txt' && \
        ./ids-update.pl )
 
 .PHONY: built-sources