]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - Makefile.am
projects / thirdparty / systemd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
sysv-generator: remove more dead code (#3462)
[thirdparty/systemd.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index cc06350c9b556a0603ac45dd088ad40771d50502..9a34c686d513c56552544117be4d0b2614889510 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 \
@@ -745,10 +746,9 @@ noinst_LTLIBRARIES += \
 libbasic_la_SOURCES = \
        src/basic/missing.h \
        src/basic/missing_syscall.h \
+       src/basic/raw-clone.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 \
@@ -964,6 +964,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 \
@@ -1038,7 +1039,11 @@ libshared_la_SOURCES = \
        src/shared/machine-pool.c \
        src/shared/machine-pool.h \
        src/shared/resolve-util.c \
-       src/shared/resolve-util.h
+       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
 
 if HAVE_UTMP
 libshared_la_SOURCES += \
@@ -1383,6 +1388,9 @@ pkgconfigdata_DATA += \
 nodist_rpmmacros_DATA = \
        src/core/macros.systemd
 
+BUILT_SOURCES += \
+       src/core/triggers.systemd
+
 EXTRA_DIST += \
        src/core/systemd.pc.in \
        src/core/macros.systemd.in \
@@ -1421,7 +1429,7 @@ tests += \
        test-watchdog \
        test-cgroup-mask \
        test-job-type \
-       test-env-replace \
+       test-env-util \
        test-strbuf \
        test-strv \
        test-path \
@@ -1491,7 +1499,6 @@ tests += \
        test-copy \
        test-cap-list \
        test-sigbus \
-       test-rbtree \
        test-verbs \
        test-af-list \
        test-arphrd-list \
@@ -1563,6 +1570,7 @@ EXTRA_DIST += \
        test/test-execute/exec-passenvironment-repeated.service \
        test/test-execute/exec-passenvironment.service \
        test/test-execute/exec-group.service \
+       test/test-execute/exec-group-nfsnobody.service \
        test/test-execute/exec-ignoresigpipe-no.service \
        test/test-execute/exec-ignoresigpipe-yes.service \
        test/test-execute/exec-personality-x86-64.service \
@@ -1578,7 +1586,10 @@ EXTRA_DIST += \
        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-systemcallfilter-system-user.service \
+       test/test-execute/exec-systemcallfilter-system-user-nfsnobody.service \
        test/test-execute/exec-user.service \
+       test/test-execute/exec-user-nfsnobody.service \
        test/test-execute/exec-workingdirectory.service \
        test/test-execute/exec-umask-0177.service \
        test/test-execute/exec-umask-default.service \
@@ -1595,10 +1606,13 @@ EXTRA_DIST += \
        test/test-execute/exec-capabilityboundingset-reset.service \
        test/test-execute/exec-capabilityboundingset-simple.service \
        test/test-execute/exec-capabilityambientset.service \
+       test/test-execute/exec-capabilityambientset-nfsnobody.service \
        test/test-execute/exec-capabilityambientset-merge.service \
+       test/test-execute/exec-capabilityambientset-merge-nfsnobody.service \
        test/test-execute/exec-runtimedirectory.service \
        test/test-execute/exec-runtimedirectory-mode.service \
        test/test-execute/exec-runtimedirectory-owner.service \
+       test/test-execute/exec-runtimedirectory-owner-nfsnobody.service \
        test/bus-policy/hello.conf \
        test/bus-policy/methods.conf \
        test/bus-policy/ownerships.conf \
@@ -1738,12 +1752,6 @@ 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
 
@@ -2190,10 +2198,10 @@ test_cgroup_util_SOURCES = \
 test_cgroup_util_LDADD = \
        libshared.la
 
-test_env_replace_SOURCES = \
-       src/test/test-env-replace.c
+test_env_util_SOURCES = \
+       src/test/test-env-util.c
 
-test_env_replace_LDADD = \
+test_env_util_LDADD = \
        libshared.la
 
 test_strbuf_SOURCES = \
@@ -3009,16 +3017,22 @@ 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 \
-       src/core/loopback-setup.h
+       src/core/loopback-setup.h \
+       src/core/machine-id-setup.c \
+       src/core/machine-id-setup.h
 
 nodist_systemd_nspawn_SOURCES = \
        src/nspawn/nspawn-gperf.c
@@ -3040,6 +3054,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
@@ -3405,6 +3430,9 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/network-internal.c \
        src/libsystemd-network/network-internal.h \
        src/libsystemd-network/sd-ndisc.c \
+       src/libsystemd-network/ndisc-internal.h \
+       src/libsystemd-network/ndisc-router.h \
+       src/libsystemd-network/ndisc-router.c \
        src/libsystemd-network/icmp6-util.h \
        src/libsystemd-network/icmp6-util.c \
        src/libsystemd-network/sd-dhcp6-client.c \
@@ -3416,7 +3444,6 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/sd-dhcp6-lease.c \
        src/libsystemd-network/dhcp-identifier.h \
        src/libsystemd-network/dhcp-identifier.c \
-       src/libsystemd-network/lldp.h \
        src/libsystemd-network/lldp-internal.h \
        src/libsystemd-network/lldp-network.h \
        src/libsystemd-network/lldp-network.c \
@@ -3578,7 +3605,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 \
@@ -3820,9 +3848,11 @@ check_DATA += \
 endif
 
 # packed sysfs test tree
-test/sys:
+test/sys: test/sys.tar.xz
+       -rm -rf test/sys
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
+       -touch test/sys
 
 test-sys-distclean:
        -rm -rf test/sys
@@ -4255,7 +4285,9 @@ libsystemd_journal_internal_la_SOURCES = \
        src/journal/mmap-cache.h \
        src/journal/compress.c \
        src/journal/audit-type.h \
-       src/journal/audit-type.c
+       src/journal/audit-type.c \
+       src/shared/gcrypt-util.h \
+       src/shared/gcrypt-util.c
 
 nodist_libsystemd_journal_internal_la_SOURCES = \
        src/journal/audit_type-to-name.h
@@ -4287,9 +4319,7 @@ libsystemd_journal_internal_la_SOURCES += \
        src/journal/journal-authenticate.c \
        src/journal/journal-authenticate.h \
        src/journal/fsprg.c \
-       src/journal/fsprg.h \
-       src/shared/gcrypt-util.c \
-       src/shared/gcrypt-util.h
+       src/journal/fsprg.h
 
 libsystemd_journal_internal_la_LIBADD += \
        $(GCRYPT_LIBS)
@@ -4326,6 +4356,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 \
@@ -4717,7 +4748,7 @@ systemd_localed_SOURCES = \
 
 systemd_localed_LDADD = \
        libshared.la \
-       $(XKBCOMMON_LIBS)
+       -ldl
 
 systemd_localed_CFLAGS = \
        $(AM_CFLAGS) \
@@ -4868,6 +4899,17 @@ EXTRA_DIST += \
        units/systemd-timesyncd.service.in \
        src/timesync/timesyncd.conf.in
 
+# ------------------------------------------------------------------------------
+test_nss_SOURCES = \
+       src/test/test-nss.c
+
+test_nss_LDADD = \
+       libsystemd-internal.la \
+       -ldl
+
+manual_tests += \
+       test-nss
+
 # ------------------------------------------------------------------------------
 if HAVE_MYHOSTNAME
 libnss_myhostname_la_SOURCES = \
@@ -4909,7 +4951,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
@@ -5421,6 +5465,7 @@ libnetworkd_core_la_SOURCES = \
        src/network/networkd-ipv4ll.c \
        src/network/networkd-dhcp4.c \
        src/network/networkd-dhcp6.c \
+       src/network/networkd-ndisc.h \
        src/network/networkd-ndisc.c \
        src/network/networkd-network.h \
        src/network/networkd-network.c \
@@ -5480,6 +5525,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
 
@@ -5505,6 +5556,7 @@ test_network_tables_LDADD += \
 endif
 
 tests += \
+       test-networkd-conf \
        test-network \
        test-network-tables
 
@@ -5703,7 +5755,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 += \
@@ -5740,7 +5792,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
@@ -5793,6 +5846,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 += \
@@ -5857,6 +5920,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)|' \
Unnamed repository; edit this file 'description' to name the repository.