]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - Makefile.am
shared: simplify dns_name_hash_func() end of name detection
[thirdparty/systemd.git] / Makefile.am
index cd9aea6bc8dd613e54d17273cc675caae4bddbad..c5b15b884a272ed1acbbd4ddc99fc7319dd570fd 100644 (file)
@@ -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)
@@ -426,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
@@ -660,6 +662,7 @@ EXTRA_DIST += \
        README.md \
        autogen.sh \
        .dir-locals.el \
+       .editorconfig \
        .vimrc \
        .ycm_extra_conf.py \
        .travis.yml \
@@ -742,8 +745,6 @@ CLEANFILES += \
        man/systemd.index.xml \
        man/systemd.directives.xml
 
-EXTRA_DIST += \
-       tools/make-man-rules.py
 
 endif
 
@@ -752,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
@@ -764,6 +766,8 @@ libbasic_la_SOURCES = \
        src/basic/missing.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 \
@@ -945,7 +949,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 \
@@ -1005,7 +1010,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 \
@@ -1050,7 +1054,9 @@ libshared_la_SOURCES = \
        src/shared/machine-image.c \
        src/shared/machine-image.h \
        src/shared/machine-pool.c \
-       src/shared/machine-pool.h
+       src/shared/machine-pool.h \
+       src/shared/resolve-util.c \
+       src/shared/resolve-util.h
 
 if HAVE_UTMP
 libshared_la_SOURCES += \
@@ -1491,11 +1497,18 @@ tests += \
        test-copy \
        test-cap-list \
        test-sigbus \
+       test-rbtree \
        test-verbs \
        test-af-list \
        test-arphrd-list \
        test-dns-domain \
-       test-install-root
+       test-install-root \
+       test-rlimit-util
+
+if HAVE_ACL
+tests += \
+       test-acl-util
+endif
 
 EXTRA_DIST += \
        test/a.service \
@@ -1721,6 +1734,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
 
@@ -1844,9 +1863,21 @@ 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
 
+test_rlimit_util_SOURCES = \
+       src/test/test-rlimit-util.c
+
+test_rlimit_util_LDADD = \
+       libshared.la
+
 BUILT_SOURCES += \
        src/test/test-hashmap-ordered.c
 
@@ -2384,6 +2415,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
@@ -2391,6 +2427,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
 
 # ------------------------------------------------------------------------------
@@ -3039,7 +3076,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 \
@@ -3068,8 +3104,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 \
@@ -3351,7 +3386,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 = \
@@ -3712,6 +3746,7 @@ EXTRA_DIST += \
        hwdb/sdio.ids
 
 # ------------------------------------------------------------------------------
+if ENABLE_TESTS
 TESTS += \
        test/udev-test.pl
 
@@ -3724,6 +3759,7 @@ TESTS += \
        test/sysv-generator-test.py
 endif
 endif
+endif
 
 manual_tests += \
        test-libudev \
@@ -3743,8 +3779,10 @@ test_udev_LDADD = \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
 
+if ENABLE_TESTS
 check_DATA += \
        test/sys
+endif
 
 # packed sysfs test tree
 test/sys:
@@ -3898,11 +3936,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
@@ -4806,9 +4839,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
@@ -4822,15 +4852,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
@@ -4994,8 +5027,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 \
@@ -5126,24 +5157,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 \
@@ -5161,12 +5197,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
 
@@ -5175,12 +5217,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
@@ -5212,9 +5248,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
@@ -5258,10 +5291,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
@@ -5429,14 +5492,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
@@ -5674,6 +5739,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 += \
@@ -6164,21 +6235,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                                             \
@@ -6188,8 +6245,6 @@ 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 && \
@@ -6232,14 +6287,14 @@ install-tree: all
        tree $(abs_srcdir)/install-tree
 
 # Let's run all tests of the test suite, but under valgrind. Let's
-# exclude the one perl script we have in there
+# exclude perl/python/shell scripts we have in there
 .PHONY: valgrind-tests
 valgrind-tests: $(TESTS)
-       $(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
+       $(AM_V_GEN)for f in $(filter-out %.pl %.py, $^); do \
                if file $$f | grep -q shell; then \
                echo -e "$${x}Skipping non-binary $$f"; else \
                echo -e "$${x}Running $$f"; \
-               libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
+               $(LIBTOOL) --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
                x="\n\n"; \
        done