X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=f2a3bbd024fdff477e493d4bc5e5d93cff870ac9;hb=091a364c802e34a58f3260c9cb5db9b75c62215c;hp=ddfec1bdeff35bb3531572ad86f82f52ec791397;hpb=679be2a74241a70028438217bace423a1a45faa6;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index ddfec1bde..f2a3bbd02 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2641,7 +2641,8 @@ INSTALL_DIRS += \
 
 dist_network_DATA = \
 	network/99-default.link \
-	network/80-container-host0.network
+	network/80-container-host0.network \
+	network/80-container-ve.network
 
 dist_udevrules_DATA += \
 	rules/42-usb-hid-pm.rules \
@@ -4066,6 +4067,7 @@ systemd_timesyncd_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-resolve.la \
 	libsystemd-network.la \
+	libsystemd-capability.la \
 	-lm
 
 rootlibexec_PROGRAMS += \
@@ -4191,6 +4193,51 @@ EXTRA_DIST += \
 
 endif
 
+# ------------------------------------------------------------------------------
+if ENABLE_RESOLVED
+systemd_resolved_SOURCES = \
+	src/resolve/resolved.h \
+	src/resolve/resolved.c \
+	src/resolve/resolved-manager.c
+
+nodist_systemd_resolved_SOURCES = \
+	src/resolve/resolved-gperf.c
+
+EXTRA_DIST += \
+	src/resolve/resolved-gperf.gperf
+
+CLEANFILES += \
+	src/resolve/resolved-gperf.c
+
+systemd_resolved_LDADD = \
+	libsystemd-label.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la \
+	libsystemd-network.la
+
+rootlibexec_PROGRAMS += \
+	systemd-resolved
+
+nodist_systemunit_DATA += \
+	units/systemd-resolved.service
+
+EXTRA_DIST += \
+	units/systemd-resolved.service.in
+
+GENERAL_ALIASES += \
+	$(systemunitdir)/systemd-resolved.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-resolved.service
+
+nodist_pkgsysconf_DATA += \
+	src/resolve/resolved.conf
+
+EXTRA_DIST += \
+	src/resolve/resolved.conf.in
+
+CLEANFILES += \
+	src/resolve/resolved.conf
+
+endif
+
 # ------------------------------------------------------------------------------
 if ENABLE_NETWORKD
 rootlibexec_PROGRAMS += \
@@ -4232,14 +4279,6 @@ libsystemd_networkd_core_la_LIBADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la
 
-nodist_systemunit_DATA += \
-	units/systemd-networkd.service \
-	units/systemd-networkd-wait-online.service
-
-GENERAL_ALIASES += \
-	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
-	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
-
 rootlibexec_PROGRAMS += \
 	systemd-networkd-wait-online
 
@@ -4269,6 +4308,14 @@ test_network_LDADD = \
 tests += \
 	test-network
 
+nodist_systemunit_DATA += \
+	units/systemd-networkd.service \
+	units/systemd-networkd-wait-online.service
+
+GENERAL_ALIASES += \
+	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
+	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
+
 EXTRA_DIST += \
 	src/network/networkd-network-gperf.gperf \
 	src/network/networkd-netdev-gperf.gperf \
@@ -4831,7 +4878,8 @@ substitutions = \
        '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
        '|PYTHON=$(PYTHON)|' \
        '|PYTHON_BINARY=$(PYTHON_BINARY)|' \
-       '|NTP_SERVERS=$(NTP_SERVERS)|'
+       '|NTP_SERVERS=$(NTP_SERVERS)|' \
+       '|DNS_SERVERS=$(DNS_SERVERS)|'
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \