1 files changed, 19 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am
index 5fc14d91ae..7783882d12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -187,6 +187,7 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/login \
 	-I $(top_srcdir)/src/journal \
 	-I $(top_srcdir)/src/timedate \
+	-I $(top_srcdir)/src/timesync \
 	-I $(top_srcdir)/src/systemd \
 	-I $(top_builddir)/src/core \
 	-I $(top_srcdir)/src/core \
@@ -3952,24 +3953,13 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_TIMEDATED
-libsystemd_timedated_core_la_SOURCES = \
-	src/timedate/timedate-sntp.c \
-	src/timedate/timedate-sntp.h
-
-libsystemd_timedated_core_la_LIBADD = \
-	libsystemd-label.la \
-	libsystemd-internal.la \
-	libsystemd-shared.la \
-	-lm
-
-noinst_LTLIBRARIES += \
-	libsystemd-timedated-core.la
-
 systemd_timedated_SOURCES = \
 	src/timedate/timedated.c
 
 systemd_timedated_LDADD = \
-	libsystemd-timedated-core.la
+	libsystemd-label.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
 	systemd-timedated
@@ -4014,15 +4004,6 @@ dist_bashcompletion_DATA += \
 
 dist_zshcompletion_DATA += \
 	shell-completion/zsh/_timedatectl
-
-test_timedate_sntp_SOURCES = \
-	src/timedate/test-timedate-sntp.c
-
-test_timedate_sntp_LDADD = \
-	libsystemd-timedated-core.la
-
-manual_tests += \
-	test-timedate-sntp
 endif
 
 polkitpolicy_in_files += \
@@ -4032,6 +4013,21 @@ EXTRA_DIST += \
 	units/systemd-timedated.service.in
 
 # ------------------------------------------------------------------------------
+if ENABLE_TIMESYNCD
+systemd_timesyncd_SOURCES = \
+	src/timesync/timesyncd.c
+
+systemd_timesyncd_LDADD = \
+	libsystemd-label.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la \
+	-lm
+
+noinst_PROGRAMS += \
+	systemd-timesyncd
+endif
+
+# ------------------------------------------------------------------------------
 if HAVE_MYHOSTNAME
 libnss_myhostname_la_SOURCES = \
 	src/nss-myhostname/nss-myhostname.c \