systemctl: remove empty line between comment and action

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 34eaefd0bf40897b9399cf70b7006cf7b91256ed..f8e1fac9677f46797de25b1f2bdfe3b65107cc2d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,9 +42,9 @@ LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=14
+LIBSYSTEMD_CURRENT=15
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=14
+LIBSYSTEMD_AGE=15
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -467,6 +467,7 @@ dist_systemunit_DATA = \
        units/local-fs-pre.target \
        units/initrd.target \
        units/initrd-fs.target \
+       units/initrd-root-device.target \
        units/initrd-root-fs.target \
        units/remote-fs.target \
        units/remote-fs-pre.target \
@@ -962,6 +963,7 @@ noinst_LTLIBRARIES += \
 
 libshared_la_SOURCES = \
        src/shared/output-mode.h \
+       src/shared/output-mode.c \
        src/shared/gpt.h \
        src/shared/udev-util.h \
        src/shared/linux/auto_dev-ioctl.h \
@@ -1037,6 +1039,8 @@ libshared_la_SOURCES = \
        src/shared/machine-pool.h \
        src/shared/resolve-util.c \
        src/shared/resolve-util.h \
+       src/shared/bus-unit-util.c \
+       src/shared/bus-unit-util.h \
        src/shared/tests.h \
        src/shared/tests.c
 
@@ -3012,12 +3016,16 @@ systemd_nspawn_SOURCES = \
        src/nspawn/nspawn-expose-ports.h \
        src/nspawn/nspawn-cgroup.c \
        src/nspawn/nspawn-cgroup.h \
+       src/nspawn/nspawn-seccomp.c \
+       src/nspawn/nspawn-seccomp.h \
        src/nspawn/nspawn-register.c \
        src/nspawn/nspawn-register.h \
        src/nspawn/nspawn-setuid.c \
        src/nspawn/nspawn-setuid.h \
        src/nspawn/nspawn-stub-pid1.c \
        src/nspawn/nspawn-stub-pid1.h \
+       src/nspawn/nspawn-patch-uid.c \
+       src/nspawn/nspawn-patch-uid.h \
        src/core/mount-setup.c \
        src/core/mount-setup.h \
        src/core/loopback-setup.c \
@@ -3045,6 +3053,17 @@ systemd_nspawn_LDADD += \
        libfirewall.la
 endif
 
+test_patch_uid_SOURCES = \
+       src/nspawn/nspawn-patch-uid.c \
+       src/nspawn/nspawn-patch-uid.h \
+       src/nspawn/test-patch-uid.c
+
+test_patch_uid_LDADD = \
+       libshared.la
+
+manual_tests += \
+       test-patch-uid
+
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
        src/run/run.c
@@ -3582,7 +3601,8 @@ INSTALL_DIRS += \
 dist_network_DATA = \
        network/99-default.link \
        network/80-container-host0.network \
-       network/80-container-ve.network
+       network/80-container-ve.network \
+       network/80-container-vz.network
 
 dist_udevrules_DATA += \
        rules/50-udev-default.rules \
@@ -4332,6 +4352,7 @@ dist_pkgsysconf_DATA += \
        src/journal/journald.conf
 
 dist_catalog_DATA = \
+       catalog/systemd.bg.catalog \
        catalog/systemd.be.catalog \
        catalog/systemd.be@latin.catalog \
        catalog/systemd.fr.catalog \
@@ -4722,7 +4743,8 @@ systemd_localed_SOURCES = \
        src/locale/localed.c
 
 systemd_localed_LDADD = \
-       libshared.la
+       libshared.la \
+       -ldl
 
 systemd_localed_CFLAGS = \
        $(AM_CFLAGS) \
@@ -4925,7 +4947,9 @@ libmachine_core_la_SOURCES = \
        src/machine/machine-dbus.c \
        src/machine/machine-dbus.h \
        src/machine/image-dbus.c \
-       src/machine/image-dbus.h
+       src/machine/image-dbus.h \
+       src/machine/operation.c \
+       src/machine/operation.h
 
 libmachine_core_la_LIBADD = \
        libshared.la
@@ -5496,6 +5520,12 @@ networkctl_LDADD = \
 dist_bashcompletion_data += \
        shell-completion/bash/networkctl
 
+test_networkd_conf_SOURCES = \
+       src/network/test-networkd-conf.c
+
+test_networkd_conf_LDADD = \
+       libnetworkd-core.la
+
 test_network_SOURCES = \
        src/network/test-network.c
 
@@ -5521,6 +5551,7 @@ test_network_tables_LDADD += \
 endif
 
 tests += \
+       test-networkd-conf \
        test-network \
        test-network-tables
 
@@ -5719,7 +5750,7 @@ dist_dbussystemservice_DATA += \
 dist_dbuspolicy_DATA += \
        src/login/org.freedesktop.login1.conf
 
-dist_pkgsysconf_DATA += \
+nodist_pkgsysconf_DATA += \
        src/login/logind.conf
 
 polkitpolicy_files += \
@@ -5756,7 +5787,8 @@ gperf_gperf_sources += \
 EXTRA_DIST += \
        src/login/71-seat.rules.in \
        src/login/73-seat-late.rules.in \
-       units/systemd-logind.service.in
+       units/systemd-logind.service.in \
+       src/login/logind.conf.in
 
 # ------------------------------------------------------------------------------
 if HAVE_PAM
@@ -5809,6 +5841,16 @@ EXTRA_DIST += \
        test/TEST-07-ISSUE-1981/Makefile \
        test/TEST-07-ISSUE-1981/test-segfault.sh \
        test/TEST-07-ISSUE-1981/test.sh \
+       test/TEST-08-ISSUE-2730/Makefile \
+       test/TEST-08-ISSUE-2730/test.sh \
+       test/TEST-09-ISSUE-2691/Makefile \
+       test/TEST-09-ISSUE-2691/test.sh \
+       test/TEST-10-ISSUE-2467/Makefile \
+       test/TEST-10-ISSUE-2467/test.sh \
+       test/TEST-11-ISSUE-3166/Makefile \
+       test/TEST-11-ISSUE-3166/test.sh \
+       test/TEST-12-ISSUE-3171/Makefile \
+       test/TEST-12-ISSUE-3171/test.sh \
        test/test-functions
 
 EXTRA_DIST += \
@@ -5873,6 +5915,7 @@ substitutions = \
        '|NTP_SERVERS=$(NTP_SERVERS)|' \
        '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|DEFAULT_DNSSEC_MODE=$(DEFAULT_DNSSEC_MODE)|' \
+       '|KILL_USER_PROCESSES=$(KILL_USER_PROCESSES)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
        '|TTY_GID=$(TTY_GID)|' \