]> 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
Merge pull request #2111 from evverx/remove-unnecessary-checking
[thirdparty/systemd.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 296f2c7e5f534fc574af0114cd0c3af4697d2fd7..917001fbc7968a9030e87bf2fcd4b96f3046f8c2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -947,7 +947,8 @@ libbasic_la_SOURCES = \
        src/basic/copy.h \
        src/basic/alloc-util.h \
        src/basic/alloc-util.c \
-       src/basic/formats-util.h
+       src/basic/formats-util.h \
+       src/basic/nss-util.h
 
 nodist_libbasic_la_SOURCES = \
        src/basic/errno-from-name.h \
@@ -1007,7 +1008,6 @@ libshared_la_SOURCES = \
        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 \
@@ -1499,6 +1499,11 @@ tests += \
        test-dns-domain \
        test-install-root
 
+if HAVE_ACL
+tests += \
+       test-acl-util
+endif
+
 EXTRA_DIST += \
        test/a.service \
        test/basic.target \
@@ -1846,6 +1851,12 @@ test_install_root_SOURCES = \
 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
 
@@ -3041,7 +3052,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 \
@@ -3070,8 +3080,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 \
@@ -3353,7 +3362,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 = \
@@ -4808,9 +4816,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
@@ -4824,15 +4829,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
@@ -5128,12 +5136,13 @@ 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 \
@@ -5173,6 +5182,10 @@ systemd_resolved_SOURCES = \
        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
 
@@ -5218,9 +5231,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
@@ -5264,10 +5274,34 @@ 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
 
 EXTRA_DIST += \
-       units/systemd-resolved.service.m4.in
+       units/systemd-resolved.service.m4.in \
+       src/resolve/resolved.conf.in
 
 # ------------------------------------------------------------------------------
 if ENABLE_NETWORKD
@@ -5435,14 +5469,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
@@ -5680,6 +5716,9 @@ 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-functions
 
 EXTRA_DIST += \
@@ -6173,19 +6212,13 @@ endif
 #
 # Require python when making dist
 #
-.PHONY: dist-check-python dist-check-compat-libs dist-check-help
+.PHONY: dist-check-python 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
-
 dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
        for i in $(abspath $^); do                                             \
             if $$i  --help | grep -v 'default:' | grep -E -q '.{80}.' ; then   \
@@ -6194,7 +6227,7 @@ dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
                exit 1;                                                        \
             fi; done
 
-dist: dist-check-python dist-check-compat-libs
+dist: dist-check-python
 
 .PHONY: hwdb-update
 hwdb-update:
Unnamed repository; edit this file 'description' to name the repository.