chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
networkd: manager - read fallback DNS servers from config file
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index cbb405b15e7107c4674abecbb5392f1c84ea7808..f6c195b26306bf90c9f42830a86dda26ed8ca696 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,6 +101,7 @@ udevrulesdir=$(udevlibexecdir)/rules.d
 udevhwdbdir=$(udevlibexecdir)/hwdb.d
 catalogdir=$(prefix)/lib/systemd/catalog
 kernelinstalldir = $(prefix)/lib/kernel/install.d
+ntpunitsdir=$(prefix)/lib/systemd/ntp-units.d
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
@@ -128,6 +129,7 @@ polkitpolicy_in_files =
 polkitpolicy_files =
 dist_udevrules_DATA =
 nodist_udevrules_DATA =
+nodist_pkgsysconf_DATA =
 dist_pkgsysconf_DATA =
 dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
@@ -799,6 +801,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/clean-ipc.c \
        src/shared/login-shared.c \
        src/shared/login-shared.h \
+       src/shared/ring.c \
+       src/shared/ring.h \
        src/shared/async.c \
        src/shared/async.h
 
@@ -1196,6 +1200,7 @@ tests += \
        test-utf8 \
        test-ellipsize \
        test-util \
+       test-ring \
        test-tmpfiles \
        test-namespace \
        test-date \
@@ -1323,6 +1328,12 @@ test_util_SOURCES = \
 test_util_LDADD = \
        libsystemd-core.la
 
+test_ring_SOURCES = \
+       src/test/test-ring.c
+
+test_ring_LDADD = \
+       libsystemd-core.la
+
 test_tmpfiles_SOURCES = \
        src/test/test-tmpfiles.c
 
@@ -2108,6 +2119,8 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-bus/bus-track.h \
        src/libsystemd/sd-bus/bus-util.c \
        src/libsystemd/sd-bus/bus-util.h \
+       src/libsystemd/sd-bus/bus-slot.c \
+       src/libsystemd/sd-bus/bus-slot.h \
        src/libsystemd/sd-bus/bus-protocol.h \
        src/libsystemd/sd-bus/kdbus.h \
        src/libsystemd/sd-bus/sd-memfd.c \
@@ -2468,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 \
@@ -2493,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 \
@@ -3669,6 +3687,19 @@ nodist_systemunit_DATA += \
        units/systemd-readahead-replay.service \
        units/systemd-readahead-done.service
 
+manual_tests += \
+       test-ssd
+
+test_ssd_SOURCES = \
+       src/readahead/test-ssd.c \
+       src/readahead/readahead-common.c \
+       src/readahead/readahead-common.h
+
+test_ssd_LDADD = \
+       libsystemd-internal.la \
+       libudev-internal.la \
+       libsystemd-shared.la
+
 endif
 
 EXTRA_DIST += \
@@ -4017,13 +4048,24 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 if ENABLE_TIMESYNCD
 systemd_timesyncd_SOURCES = \
-       src/timesync/timesyncd.c
+       src/timesync/timesyncd.c \
+       src/timesync/timesyncd.h
+
+nodist_systemd_timesyncd_SOURCES = \
+       src/timesync/timesyncd-gperf.c
+
+EXTRA_DIST += \
+       src/timesync/timesyncd-gperf.gperf
+
+CLEANFILES += \
+       src/timesync/timesyncd-gperf.c
 
 systemd_timesyncd_LDADD = \
        libsystemd-label.la \
        libsystemd-internal.la \
        libsystemd-shared.la \
        libsystemd-resolve.la \
+       libsystemd-network.la \
        -lm
 
 rootlibexec_PROGRAMS += \
@@ -4034,6 +4076,19 @@ nodist_systemunit_DATA += \
 
 EXTRA_DIST += \
        units/systemd-timesyncd.service.in
+
+nodist_pkgsysconf_DATA += \
+       src/timesync/timesyncd.conf
+
+EXTRA_DIST += \
+       src/timesync/timesyncd.conf.in
+
+CLEANFILES += \
+       src/timesync/timesyncd.conf
+
+dist_ntpunits_DATA = \
+       src/timesync/90-systemd.list
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -4145,16 +4200,22 @@ systemd_networkd_SOURCES = \
        src/network/networkd.c
 
 systemd_networkd_LDADD = \
-       libsystemd-networkd-core.la
+       libsystemd-networkd-core.la \
+       $(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 \
        src/network/networkd-link.c \
        src/network/networkd-netdev.c \
+       src/network/networkd-tunnel.c \
        src/network/networkd-network.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
@@ -4162,7 +4223,8 @@ libsystemd_networkd_core_la_SOURCES = \
 
 nodist_libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd-network-gperf.c \
-       src/network/networkd-netdev-gperf.c
+       src/network/networkd-netdev-gperf.c \
+       src/network/networkd-gperf.c
 
 libsystemd_networkd_core_la_LIBADD = \
        libudev-internal.la \
@@ -4171,17 +4233,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 \
@@ -4191,26 +4249,43 @@ systemd_networkd_wait_online_LDADD = \
        libsystemd-network.la \
        libudev-internal.la \
        libsystemd-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-network.la
 
 test_network_SOURCES = \
        src/network/test-network.c
 
 test_network_LDADD = \
        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
+
+nodist_pkgsysconf_DATA += \
+       src/network/networkd.conf
+
 EXTRA_DIST += \
        src/network/networkd-network-gperf.gperf \
        src/network/networkd-netdev-gperf.gperf \
+       src/network/networkd-gperf.gperf \
        units/systemd-networkd.service.in \
-       units/systemd-networkd-wait-online.service.in
+       units/systemd-networkd-wait-online.service.in \
+       src/network/networkd.conf.in
 
 CLEANFILES += \
        src/network/networkd-network-gperf.c \
-       src/network/networkd-netdev-gperf.c
+       src/network/networkd-netdev-gperf.c \
+       src/network/networkd-gperf.c \
+       src/network/networkd.conf
 endif
 
 # ------------------------------------------------------------------------------
@@ -4763,7 +4838,9 @@ substitutions = \
        '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
        '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
        '|PYTHON=$(PYTHON)|' \
-       '|PYTHON_BINARY=$(PYTHON_BINARY)|'
+       '|PYTHON_BINARY=$(PYTHON_BINARY)|' \
+       '|NTP_SERVERS=$(NTP_SERVERS)|' \
+       '|DNS_SERVERS=$(DNS_SERVERS)|'
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -4791,6 +4868,9 @@ src/%.policy.in: src/%.policy.in.in
 %.rules: %.rules.in
        $(SED_PROCESS)
 
+%.conf: %.conf.in
+       $(SED_PROCESS)
+
 %.sh: %.sh.in
        $(SED_PROCESS)
        $(AM_V_GEN)chmod +x $@
Unnamed repository; edit this file 'description' to name the repository.