resolved: add a generic DnsSearchDomain concept

[thirdparty/systemd.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cec07fac27e6142637f99932b25f3850ebf16f8f..296f2c7e5f534fc574af0114cd0c3af4697d2fd7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,9 +42,9 @@ LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=12
+LIBSYSTEMD_CURRENT=13
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=12
+LIBSYSTEMD_AGE=13
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
@@ -426,6 +426,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 +661,7 @@ EXTRA_DIST += \
        README.md \
        autogen.sh \
        .dir-locals.el \
+       .editorconfig \
        .vimrc \
        .ycm_extra_conf.py \
        .travis.yml \
@@ -725,8 +727,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"
 
@@ -1138,8 +1140,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 \
@@ -1178,8 +1178,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 \
@@ -1403,7 +1401,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
 
 # ------------------------------------------------------------------------------
 
@@ -1497,7 +1496,8 @@ tests += \
        test-verbs \
        test-af-list \
        test-arphrd-list \
-       test-dns-domain
+       test-dns-domain \
+       test-install-root
 
 EXTRA_DIST += \
        test/a.service \
@@ -1550,6 +1550,10 @@ EXTRA_DIST += \
        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 \
@@ -1836,6 +1840,12 @@ 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_namespace_LDADD = \
        libcore.la
 
@@ -5130,6 +5140,8 @@ systemd_resolved_SOURCES = \
        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 \
@@ -5153,6 +5165,8 @@ 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 \
@@ -5361,6 +5375,11 @@ networkctl_LDADD = \
        libshared.la \
        libsystemd-network.la
 
+if ENABLE_BASH_COMPLETION
+dist_bashcompletion_DATA += \
+       shell-completion/bash/networkctl
+endif
+
 test_network_SOURCES = \
        src/network/test-network.c
 
@@ -5873,7 +5892,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
@@ -6182,9 +6201,9 @@ 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