chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timesyncd: fix typo in comment
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 0232e75807e2fd5b0824f77f56db8b65ff5a60a8..ddfec1bdeff35bb3531572ad86f82f52ec791397 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
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@
# And these are the special ones for /
rootprefix=@rootprefix@
@@
-128,6
+129,7
@@
polkitpolicy_in_files =
polkitpolicy_files =
dist_udevrules_DATA =
nodist_udevrules_DATA =
polkitpolicy_files =
dist_udevrules_DATA =
nodist_udevrules_DATA =
+nodist_pkgsysconf_DATA =
dist_pkgsysconf_DATA =
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
dist_pkgsysconf_DATA =
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
@@
-798,7
+800,11
@@
libsystemd_shared_la_SOURCES = \
src/shared/clean-ipc.h \
src/shared/clean-ipc.c \
src/shared/login-shared.c \
src/shared/clean-ipc.h \
src/shared/clean-ipc.c \
src/shared/login-shared.c \
- src/shared/login-shared.h
+ src/shared/login-shared.h \
+ src/shared/ring.c \
+ src/shared/ring.h \
+ src/shared/async.c \
+ src/shared/async.h
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
@@
-1028,8
+1034,6
@@
libsystemd_core_la_SOURCES = \
src/core/killall.c \
src/core/audit-fd.c \
src/core/audit-fd.h \
src/core/killall.c \
src/core/audit-fd.c \
src/core/audit-fd.h \
- src/core/async.c \
- src/core/async.h \
src/core/show-status.c \
src/core/show-status.h
src/core/show-status.c \
src/core/show-status.h
@@
-1196,6
+1200,7
@@
tests += \
test-utf8 \
test-ellipsize \
test-util \
test-utf8 \
test-ellipsize \
test-util \
+ test-ring \
test-tmpfiles \
test-namespace \
test-date \
test-tmpfiles \
test-namespace \
test-date \
@@
-1323,6
+1328,12
@@
test_util_SOURCES = \
test_util_LDADD = \
libsystemd-core.la
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
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-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 \
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
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 \
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_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 \
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
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 += \
endif
EXTRA_DIST += \
@@
-4017,12
+4048,24
@@
EXTRA_DIST += \
# ------------------------------------------------------------------------------
if ENABLE_TIMESYNCD
systemd_timesyncd_SOURCES = \
# ------------------------------------------------------------------------------
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 \
systemd_timesyncd_LDADD = \
libsystemd-label.la \
libsystemd-internal.la \
libsystemd-shared.la \
+ libsystemd-resolve.la \
+ libsystemd-network.la \
-lm
rootlibexec_PROGRAMS += \
-lm
rootlibexec_PROGRAMS += \
@@
-4033,6
+4076,19
@@
nodist_systemunit_DATA += \
EXTRA_DIST += \
units/systemd-timesyncd.service.in
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
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
@@
-4144,16
+4200,22
@@
systemd_networkd_SOURCES = \
src/network/networkd.c
systemd_networkd_LDADD = \
src/network/networkd.c
systemd_networkd_LDADD = \
- libsystemd-networkd-core.la
+ libsystemd-networkd-core.la \
+ $(KMOD_LIBS)
noinst_LTLIBRARIES += \
libsystemd-networkd-core.la
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 \
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 \
src/network/networkd-network.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
@@
-4181,6
+4243,10
@@
GENERAL_ALIASES += \
rootlibexec_PROGRAMS += \
systemd-networkd-wait-online
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 \
systemd_networkd_wait_online_SOURCES = \
src/libsystemd-network/network-internal.h \
src/network/networkd-wait-online.c \
@@
-4190,13
+4256,15
@@
systemd_networkd_wait_online_LDADD = \
libsystemd-network.la \
libudev-internal.la \
libsystemd-internal.la \
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
test_network_SOURCES = \
src/network/test-network.c
test_network_LDADD = \
libsystemd-networkd-core.la
+ $(KMOD_LIBS)
tests += \
test-network
tests += \
test-network
@@
-4762,7
+4830,8
@@
substitutions = \
'|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
'|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
'|PYTHON=$(PYTHON)|' \
'|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)|'
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@
-4790,6
+4859,9
@@
src/%.policy.in: src/%.policy.in.in
%.rules: %.rules.in
$(SED_PROCESS)
%.rules: %.rules.in
$(SED_PROCESS)
+%.conf: %.conf.in
+ $(SED_PROCESS)
+
%.sh: %.sh.in
$(SED_PROCESS)
$(AM_V_GEN)chmod +x $@
%.sh: %.sh.in
$(SED_PROCESS)
$(AM_V_GEN)chmod +x $@