resolved: add daemon to manage resolv.conf

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6379262ca3ca58b843098408318f11d8b61f46af..f2a3bbd024fdff477e493d4bc5e5d93cff870ac9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2481,6 +2481,10 @@ busctl_CFLAGS = \
 noinst_LTLIBRARIES += \
        libsystemd-network.la
 
+libsystemd_network_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(KMOD_CFLAGS)
+
 libsystemd_network_la_SOURCES = \
        src/systemd/sd-network.h \
        src/systemd/sd-dhcp-client.h \
@@ -2506,7 +2510,8 @@ libsystemd_network_la_SOURCES = \
 libsystemd_network_la_LIBADD = \
        libsystemd-label.la \
        libsystemd-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       $(KMOD_LIBS)
 
 test_dhcp_option_SOURCES = \
        src/libsystemd-network/dhcp-protocol.h \
@@ -2636,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 \
@@ -4061,6 +4067,7 @@ systemd_timesyncd_LDADD = \
        libsystemd-shared.la \
        libsystemd-resolve.la \
        libsystemd-network.la \
+       libsystemd-capability.la \
        -lm
 
 rootlibexec_PROGRAMS += \
@@ -4186,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 += \
@@ -4196,11 +4248,15 @@ systemd_networkd_SOURCES = \
 
 systemd_networkd_LDADD = \
        libsystemd-networkd-core.la \
-       -lkmod
+       $(KMOD_LIBS)
 
 noinst_LTLIBRARIES += \
        libsystemd-networkd-core.la
 
+libsystemd_networkd_core_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(KMOD_CFLAGS)
+
 libsystemd_networkd_core_la_SOURCES = \
        src/libsystemd-network/network-internal.h \
        src/network/networkd.h \
@@ -4223,17 +4279,13 @@ 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
 
+systemd_networkd_wait_online_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(KMOD_CFLAGS)
+
 systemd_networkd_wait_online_SOURCES = \
        src/libsystemd-network/network-internal.h \
        src/network/networkd-wait-online.c \
@@ -4250,12 +4302,20 @@ test_network_SOURCES = \
        src/network/test-network.c
 
 test_network_LDADD = \
-       libsystemd-networkd-core.la \
-       -lkmod
+       libsystemd-networkd-core.la
+       $(KMOD_LIBS)
 
 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 \
@@ -4818,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 $@) && \