ntp: import ntp-4.2.8p16

Security:       NtpBUg3767, NtpBug3808, NtpBug3807 (CVE-2023-26555)

(cherry picked from commit a466cc55373fc3cf86837f09da729535b57e69a1)

7 files changed, 272 insertions, 197 deletions

diff --git a/contrib/ntp/sntp/tests/Makefile.am b/contrib/ntp/sntp/tests/Makefile.am
index 0a0d2800bd08..00202f583de0 100644
--- a/contrib/ntp/sntp/tests/Makefile.am
+++ b/contrib/ntp/sntp/tests/Makefile.am
@@ -2,6 +2,8 @@ NULL =
 BUILT_SOURCES =
 EXTRA_PROGRAMS =
 
+# data CLEANFILES down below
+
 CLEANFILES =			\
 	debug-output-lfp-bin	\
 	debug-output-lfp-dec	\
@@ -11,6 +13,8 @@ CLEANFILES =			\
 	kod-output-single	\
 	testLogfile.log		\
 	testLogfile2.log	\
+	.version		\
+	version.c		\
 	$(NULL)
 
 DISTCLEANFILES =		\
@@ -108,7 +112,6 @@ AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
 AM_CPPFLAGS += $(CPPFLAGS_LIBEVENT)
 AM_CPPFLAGS += $(CPPFLAGS_NTP)
 AM_CPPFLAGS += -DUNITY_INCLUDE_CONFIG_H
-#AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity
 AM_CPPFLAGS += -I$(top_srcdir)/unity
 AM_CPPFLAGS += $(NTP_HARD_CPPFLAGS)
 
@@ -129,47 +132,56 @@ BUILT_SOURCES +=				\
 test_networking_SOURCES =		\
 	networking.c			\
 	run-networking.c		\
-	$(top_builddir)/version.c	\
 	$(NULL)
 
+nodist_test_networking_SOURCES =	version.c
+
 test_packetHandling_SOURCES =		\
 	packetHandling.c		\
 	run-packetHandling.c		\
-	$(top_builddir)/version.c	\
 	$(NULL)
 
+nodist_test_packetHandling_SOURCES =	version.c
+
 test_kodDatabase_SOURCES =		\
 	kodDatabase.c			\
 	run-kodDatabase.c		\
-	$(top_builddir)/version.c	\
 	$(NULL)
 
+nodist_test_kodDatabase_SOURCES =	version.c
+
 test_keyFile_SOURCES =			\
 	fileHandlingTest.c		\
 	keyFile.c			\
 	run-keyFile.c			\
-	$(top_builddir)/version.c	\
 	$(NULL)
 
+nodist_test_keyFile_SOURCES =		version.c
+
 test_kodFile_SOURCES =			\
 	fileHandlingTest.c		\
 	kodFile.c			\
 	run-kodFile.c			\
-	$(top_builddir)/version.c	\
 	$(NULL)
 
+nodist_test_kodFile_SOURCES =		version.c
+
 test_packetProcessing_SOURCES =		\
 	packetProcessing.c		\
 	run-packetProcessing.c		\
 	sntptest.c			\
 	$(NULL)
 
+nodist_test_packetProcessing_SOURCES =	version.c
+
 test_utilities_SOURCES =		\
 	fileHandlingTest.c		\
 	utilities.c			\
 	run-utilities.c			\
 	$(NULL)
 
+nodist_test_utilities_SOURCES =		version.c
+
 test_crypto_CFLAGS =			\
 	$(CFLAGS_LIBEVENT)		\
 	$(AM_CFLAGS)			\
@@ -178,15 +190,17 @@ test_crypto_CFLAGS =			\
 test_crypto_SOURCES =			\
 	crypto.c			\
 	run-crypto.c			\
-	$(top_builddir)/version.c	\
 	$(NULL)
 
+nodist_test_crypto_SOURCES =		version.c
+
 test_log_SOURCES =			\
-	t-log.c			\
+	t-log.c				\
 	run-t-log.c			\
-	$(top_builddir)/version.c	\
 	$(NULL)
 
+nodist_test_log_SOURCES =		version.c
+
 
 $(srcdir)/run-kodFile.c: $(srcdir)/kodFile.c $(std_unity_list)
 	$(run_unity) $< $@
@@ -215,10 +229,6 @@ $(srcdir)/run-crypto.c: $(srcdir)/crypto.c $(std_unity_list)
 $(srcdir)/run-t-log.c: $(srcdir)/t-log.c $(std_unity_list)
 	$(run_unity) $< $@
 
-
-#$(srcdir)/../version.c: $(srcdir)/../version.c
-#	gcc -o version.o ../version.c
-
 TESTS = 
 
 if !NTP_CROSSCOMPILE
@@ -228,34 +238,19 @@ endif
 #TESTS += tests-runner
 #endif
 
-## ensure ../libsntp.a is built
-
-BUILT_SOURCES	+= check-libsntp
-CLEANFILES	+= check-libsntp
-
-check-libsntp: ../libsntp.a
-	@echo stamp > $@
-
-../libsntp.a:
-	cd .. && $(MAKE) $(AM_MAKEFLAGS) libsntp.a
-
-## check-libntp.mf - automake fragment
-## slightly adapted for deeper directory
-
-BUILT_SOURCES	+= check-libntp check-libunity
-CLEANFILES	+= check-libntp	check-libunity
-
-check-libntp: ../../libntp/libntp.a
-	@echo stamp > $@
-
-../../libntp/libntp.a:
-	cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+version.c: Makefile $(top_srcdir)/scm-rev
+	$(AM_V_GEN)env CSET=`cat $(srcdir)/../scm-rev` $(top_builddir)/../scripts/build/mkver sntp-tests
 
-check-libunity: ../unity/libunity.a
-	@echo stamp > $@
+$(top_srcdir)/scm-rev: FRC.scm-rev
+	$(AM_V_GEN)cd .. && $(MAKE) $(AM_MAKEFLAGS) check-scm-rev
 
-../unity/libunity.a:
-	cd ../unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
+FRC.scm-rev:
+	@: FRC.scm-rev "force" depends on nothing and is not a file, so is	\
+	   always out-of-date causing targets which depend on it to also	\
+	   be outdated so their rules to fire each time they are built.
 
+include $(top_srcdir)/check-libntp.mf
+include $(top_srcdir)/check-libsntp.mf
+include $(top_srcdir)/check-libunity.mf
 include $(top_srcdir)/depsver.mf
 include $(top_srcdir)/includes.mf
diff --git a/contrib/ntp/sntp/tests/Makefile.in b/contrib/ntp/sntp/tests/Makefile.in
index a3fc69ec702e..2e52ab0b27ca 100644
--- a/contrib/ntp/sntp/tests/Makefile.in
+++ b/contrib/ntp/sntp/tests/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2021 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -138,9 +138,10 @@ am__EXEEXT_1 =
 @BUILD_TEST_KODFILE_TRUE@am__EXEEXT_3 = test-kodFile$(EXEEXT)
 am__objects_1 =
 am_test_crypto_OBJECTS = test_crypto-crypto.$(OBJEXT) \
-	test_crypto-run-crypto.$(OBJEXT) test_crypto-version.$(OBJEXT) \
-	$(am__objects_1)
-test_crypto_OBJECTS = $(am_test_crypto_OBJECTS)
+	test_crypto-run-crypto.$(OBJEXT) $(am__objects_1)
+nodist_test_crypto_OBJECTS = test_crypto-version.$(OBJEXT)
+test_crypto_OBJECTS = $(am_test_crypto_OBJECTS) \
+	$(nodist_test_crypto_OBJECTS)
 test_crypto_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = ../libsntp.a $(am__DEPENDENCIES_1) \
@@ -158,44 +159,54 @@ test_crypto_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_crypto_CFLAGS) \
 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_test_keyFile_OBJECTS = fileHandlingTest.$(OBJEXT) keyFile.$(OBJEXT) \
-	run-keyFile.$(OBJEXT) version.$(OBJEXT) $(am__objects_1)
-test_keyFile_OBJECTS = $(am_test_keyFile_OBJECTS)
+	run-keyFile.$(OBJEXT) $(am__objects_1)
+nodist_test_keyFile_OBJECTS = version.$(OBJEXT)
+test_keyFile_OBJECTS = $(am_test_keyFile_OBJECTS) \
+	$(nodist_test_keyFile_OBJECTS)
 test_keyFile_LDADD = $(LDADD)
 test_keyFile_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_test_kodDatabase_OBJECTS = kodDatabase.$(OBJEXT) \
-	run-kodDatabase.$(OBJEXT) version.$(OBJEXT) $(am__objects_1)
-test_kodDatabase_OBJECTS = $(am_test_kodDatabase_OBJECTS)
+	run-kodDatabase.$(OBJEXT) $(am__objects_1)
+nodist_test_kodDatabase_OBJECTS = version.$(OBJEXT)
+test_kodDatabase_OBJECTS = $(am_test_kodDatabase_OBJECTS) \
+	$(nodist_test_kodDatabase_OBJECTS)
 test_kodDatabase_LDADD = $(LDADD)
 test_kodDatabase_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_test_kodFile_OBJECTS = fileHandlingTest.$(OBJEXT) kodFile.$(OBJEXT) \
-	run-kodFile.$(OBJEXT) version.$(OBJEXT) $(am__objects_1)
-test_kodFile_OBJECTS = $(am_test_kodFile_OBJECTS)
+	run-kodFile.$(OBJEXT) $(am__objects_1)
+nodist_test_kodFile_OBJECTS = version.$(OBJEXT)
+test_kodFile_OBJECTS = $(am_test_kodFile_OBJECTS) \
+	$(nodist_test_kodFile_OBJECTS)
 test_kodFile_LDADD = $(LDADD)
 test_kodFile_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_test_log_OBJECTS = t-log.$(OBJEXT) run-t-log.$(OBJEXT) \
-	version.$(OBJEXT) $(am__objects_1)
-test_log_OBJECTS = $(am_test_log_OBJECTS)
+	$(am__objects_1)
+nodist_test_log_OBJECTS = version.$(OBJEXT)
+test_log_OBJECTS = $(am_test_log_OBJECTS) $(nodist_test_log_OBJECTS)
 test_log_LDADD = $(LDADD)
 test_log_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_test_networking_OBJECTS = networking.$(OBJEXT) \
-	run-networking.$(OBJEXT) version.$(OBJEXT) $(am__objects_1)
-test_networking_OBJECTS = $(am_test_networking_OBJECTS)
+	run-networking.$(OBJEXT) $(am__objects_1)
+nodist_test_networking_OBJECTS = version.$(OBJEXT)
+test_networking_OBJECTS = $(am_test_networking_OBJECTS) \
+	$(nodist_test_networking_OBJECTS)
 test_networking_LDADD = $(LDADD)
 test_networking_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_test_packetHandling_OBJECTS = packetHandling.$(OBJEXT) \
-	run-packetHandling.$(OBJEXT) version.$(OBJEXT) \
-	$(am__objects_1)
-test_packetHandling_OBJECTS = $(am_test_packetHandling_OBJECTS)
+	run-packetHandling.$(OBJEXT) $(am__objects_1)
+nodist_test_packetHandling_OBJECTS = version.$(OBJEXT)
+test_packetHandling_OBJECTS = $(am_test_packetHandling_OBJECTS) \
+	$(nodist_test_packetHandling_OBJECTS)
 test_packetHandling_LDADD = $(LDADD)
 test_packetHandling_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \
@@ -203,14 +214,18 @@ test_packetHandling_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 am_test_packetProcessing_OBJECTS = packetProcessing.$(OBJEXT) \
 	run-packetProcessing.$(OBJEXT) sntptest.$(OBJEXT) \
 	$(am__objects_1)
-test_packetProcessing_OBJECTS = $(am_test_packetProcessing_OBJECTS)
+nodist_test_packetProcessing_OBJECTS = version.$(OBJEXT)
+test_packetProcessing_OBJECTS = $(am_test_packetProcessing_OBJECTS) \
+	$(nodist_test_packetProcessing_OBJECTS)
 test_packetProcessing_LDADD = $(LDADD)
 test_packetProcessing_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_test_utilities_OBJECTS = fileHandlingTest.$(OBJEXT) \
 	utilities.$(OBJEXT) run-utilities.$(OBJEXT) $(am__objects_1)
-test_utilities_OBJECTS = $(am_test_utilities_OBJECTS)
+nodist_test_utilities_OBJECTS = version.$(OBJEXT)
+test_utilities_OBJECTS = $(am_test_utilities_OBJECTS) \
+	$(nodist_test_utilities_OBJECTS)
 test_utilities_LDADD = $(LDADD)
 test_utilities_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 	$(top_builddir)/unity/libunity.a $(am__DEPENDENCIES_1) \
@@ -229,7 +244,20 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/libevent/build-aux/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fileHandlingTest.Po \
+	./$(DEPDIR)/keyFile.Po ./$(DEPDIR)/kodDatabase.Po \
+	./$(DEPDIR)/kodFile.Po ./$(DEPDIR)/networking.Po \
+	./$(DEPDIR)/packetHandling.Po ./$(DEPDIR)/packetProcessing.Po \
+	./$(DEPDIR)/run-keyFile.Po ./$(DEPDIR)/run-kodDatabase.Po \
+	./$(DEPDIR)/run-kodFile.Po ./$(DEPDIR)/run-networking.Po \
+	./$(DEPDIR)/run-packetHandling.Po \
+	./$(DEPDIR)/run-packetProcessing.Po ./$(DEPDIR)/run-t-log.Po \
+	./$(DEPDIR)/run-utilities.Po ./$(DEPDIR)/sntptest.Po \
+	./$(DEPDIR)/t-log.Po ./$(DEPDIR)/test_crypto-crypto.Po \
+	./$(DEPDIR)/test_crypto-run-crypto.Po \
+	./$(DEPDIR)/test_crypto-version.Po ./$(DEPDIR)/utilities.Po \
+	./$(DEPDIR)/version.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -249,11 +277,17 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(test_crypto_SOURCES) $(test_keyFile_SOURCES) \
-	$(test_kodDatabase_SOURCES) $(test_kodFile_SOURCES) \
-	$(test_log_SOURCES) $(test_networking_SOURCES) \
+SOURCES = $(test_crypto_SOURCES) $(nodist_test_crypto_SOURCES) \
+	$(test_keyFile_SOURCES) $(nodist_test_keyFile_SOURCES) \
+	$(test_kodDatabase_SOURCES) $(nodist_test_kodDatabase_SOURCES) \
+	$(test_kodFile_SOURCES) $(nodist_test_kodFile_SOURCES) \
+	$(test_log_SOURCES) $(nodist_test_log_SOURCES) \
+	$(test_networking_SOURCES) $(nodist_test_networking_SOURCES) \
 	$(test_packetHandling_SOURCES) \
-	$(test_packetProcessing_SOURCES) $(test_utilities_SOURCES)
+	$(nodist_test_packetHandling_SOURCES) \
+	$(test_packetProcessing_SOURCES) \
+	$(nodist_test_packetProcessing_SOURCES) \
+	$(test_utilities_SOURCES) $(nodist_test_utilities_SOURCES)
 DIST_SOURCES = $(test_crypto_SOURCES) $(test_keyFile_SOURCES) \
 	$(test_kodDatabase_SOURCES) $(test_kodFile_SOURCES) \
 	$(test_log_SOURCES) $(test_networking_SOURCES) \
@@ -282,8 +316,6 @@ am__define_uniq_tagged_files = \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
 am__tty_colors_dummy = \
   mgn= red= grn= lgn= blu= brg= std=; \
   am__color_tests=no
@@ -466,6 +498,7 @@ am__set_TESTS_bases = \
   bases='$(TEST_LOGS)'; \
   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
   bases=`echo $$bases`
+AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
 RECHECK_LOGS = $(TEST_LOGS)
 AM_RECURSIVE_TARGETS = check recheck
 TEST_SUITE_LOG = test-suite.log
@@ -490,8 +523,9 @@ TEST_LOG_DRIVER = $(SHELL) \
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 	$(TEST_LOG_FLAGS)
 am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(srcdir)/fileHandlingTest.h.in $(top_srcdir)/depsver.mf \
-	$(top_srcdir)/includes.mf \
+	$(srcdir)/fileHandlingTest.h.in $(top_srcdir)/check-libntp.mf \
+	$(top_srcdir)/check-libsntp.mf $(top_srcdir)/check-libunity.mf \
+	$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf \
 	$(top_srcdir)/libevent/build-aux/depcomp \
 	$(top_srcdir)/libevent/build-aux/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -512,6 +546,7 @@ CALC_TICKADJ_MS = @CALC_TICKADJ_MS@
 CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_NOFORMAT = @CC_NOFORMAT@
 CFLAGS = @CFLAGS@
 CFLAGS_LIBEVENT = @CFLAGS_LIBEVENT@
 CFLAGS_NTP = @CFLAGS_NTP@
@@ -519,6 +554,8 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPFLAGS_LIBEVENT = @CPPFLAGS_LIBEVENT@
 CPPFLAGS_NTP = @CPPFLAGS_NTP@
+CSCOPE = @CSCOPE@
+CTAGS = @CTAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -530,6 +567,7 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EDITLINE_LIBS = @EDITLINE_LIBS@
 EGREP = @EGREP@
+ETAGS = @ETAGS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
@@ -715,6 +753,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -725,29 +764,24 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
-#if !NTP_CROSSCOMPILE
-#TESTS += tests-runner
-#endif
 BUILT_SOURCES = $(srcdir)/run-crypto.c $(srcdir)/run-keyFile.c \
 	$(srcdir)/run-kodDatabase.c $(srcdir)/run-kodFile.c \
 	$(srcdir)/run-networking.c $(srcdir)/run-packetHandling.c \
 	$(srcdir)/run-packetProcessing.c $(srcdir)/run-utilities.c \
-	$(NULL) check-libsntp check-libntp check-libunity .deps-ver
+	$(NULL) check-libntp check-libsntp check-libunity .deps-ver
+
+# data CLEANFILES down below
 CLEANFILES = debug-output-lfp-bin debug-output-lfp-dec \
 	debug-output-pkt kod-output-blank kod-output-multiple \
-	kod-output-single testLogfile.log testLogfile2.log $(NULL) \
-	data/kod-output-multiple data/kod-output-single \
-	data/debug-output-pkt data/debug-output-lfp-dec \
-	data/kod-output-blank data/debug-output-lfp-bin $(NULL) \
-	check-libsntp check-libntp check-libunity .deps-ver
-DISTCLEANFILES = \
-	kod-output-blank	\
-	kod-output-single 	\
-	kod-output-multiple	\
-	testLogfile.log		\
-	testLogfile2.log	\
-	$(NULL)
-
+	kod-output-single testLogfile.log testLogfile2.log .version \
+	version.c $(NULL) data/kod-output-multiple \
+	data/kod-output-single data/debug-output-pkt \
+	data/debug-output-lfp-dec data/kod-output-blank \
+	data/debug-output-lfp-bin $(NULL) check-libntp check-libsntp \
+	check-libunity .deps-ver
+DISTCLEANFILES = kod-output-blank kod-output-single \
+	kod-output-multiple testLogfile.log testLogfile2.log $(NULL) \
+	$(DEPDIR)/deps-ver
 std_unity_list = \
 	$(abs_top_srcdir)/unity/auto/generate_test_runner.rb	\
 	$(abs_srcdir)/testconf.yml				\
@@ -794,7 +828,6 @@ LDADD = \
 	$(NULL)
 
 AM_CFLAGS = $(CFLAGS_NTP) $(NTP_HARD_CFLAGS)
-#AM_CPPFLAGS += -I$(top_srcdir)/sntp/unity
 AM_CPPFLAGS = $(SNTP_INCS) -I$(srcdir)/.. -I$(top_srcdir)/../tests \
 	$(LIBOPTS_CFLAGS) $(CPPFLAGS_LIBEVENT) $(CPPFLAGS_NTP) \
 	-DUNITY_INCLUDE_CONFIG_H -I$(top_srcdir)/unity \
@@ -803,47 +836,49 @@ AM_LDFLAGS = $(LDFLAGS_NTP) $(NTP_HARD_LDFLAGS)
 test_networking_SOURCES = \
 	networking.c			\
 	run-networking.c		\
-	$(top_builddir)/version.c	\
 	$(NULL)
 
+nodist_test_networking_SOURCES = version.c
 test_packetHandling_SOURCES = \
 	packetHandling.c		\
 	run-packetHandling.c		\
-	$(top_builddir)/version.c	\
 	$(NULL)
 
+nodist_test_packetHandling_SOURCES = version.c
 test_kodDatabase_SOURCES = \
 	kodDatabase.c			\
 	run-kodDatabase.c		\
-	$(top_builddir)/version.c	\
 	$(NULL)
 
+nodist_test_kodDatabase_SOURCES = version.c
 test_keyFile_SOURCES = \
 	fileHandlingTest.c		\
 	keyFile.c			\
 	run-keyFile.c			\
-	$(top_builddir)/version.c	\
 	$(NULL)
 
+nodist_test_keyFile_SOURCES = version.c
 test_kodFile_SOURCES = \
 	fileHandlingTest.c		\
 	kodFile.c			\
 	run-kodFile.c			\
-	$(top_builddir)/version.c	\
 	$(NULL)
 
+nodist_test_kodFile_SOURCES = version.c
 test_packetProcessing_SOURCES = \
 	packetProcessing.c		\
 	run-packetProcessing.c		\
 	sntptest.c			\
 	$(NULL)
 
+nodist_test_packetProcessing_SOURCES = version.c
 test_utilities_SOURCES = \
 	fileHandlingTest.c		\
 	utilities.c			\
 	run-utilities.c			\
 	$(NULL)
 
+nodist_test_utilities_SOURCES = version.c
 test_crypto_CFLAGS = \
 	$(CFLAGS_LIBEVENT)		\
 	$(AM_CFLAGS)			\
@@ -852,29 +887,26 @@ test_crypto_CFLAGS = \
 test_crypto_SOURCES = \
 	crypto.c			\
 	run-crypto.c			\
-	$(top_builddir)/version.c	\
 	$(NULL)
 
+nodist_test_crypto_SOURCES = version.c
 test_log_SOURCES = \
-	t-log.c			\
+	t-log.c				\
 	run-t-log.c			\
-	$(top_builddir)/version.c	\
 	$(NULL)
 
-
-#$(srcdir)/../version.c: $(srcdir)/../version.c
-#	gcc -o version.o ../version.c
+nodist_test_log_SOURCES = version.c
 TESTS = $(am__append_3)
 SNTP_INCS = -I$(top_srcdir)/../include \
-	-I$(top_srcdir)/../lib/isc/include \
-	-I$(top_srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include \
-	-I$(top_srcdir)/../lib/isc/unix/include
+	-I$(top_srcdir)/../libntp/lib/isc/include \
+	-I$(top_srcdir)/../libntp/lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include \
+	-I$(top_srcdir)/../libntp/lib/isc/unix/include
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/check-libntp.mf $(top_srcdir)/check-libsntp.mf $(top_srcdir)/check-libunity.mf $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -891,10 +923,10 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
-$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
+$(top_srcdir)/check-libntp.mf $(top_srcdir)/check-libsntp.mf $(top_srcdir)/check-libunity.mf $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -958,46 +990,55 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileHandlingTest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyFile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kodDatabase.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kodFile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/networking.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packetHandling.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packetProcessing.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-keyFile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-kodDatabase.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-kodFile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-networking.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-packetHandling.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-packetProcessing.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-t-log.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-utilities.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sntptest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-log.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto-crypto.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto-run-crypto.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto-version.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utilities.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileHandlingTest.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyFile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kodDatabase.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kodFile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/networking.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packetHandling.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/packetProcessing.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-keyFile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-kodDatabase.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-kodFile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-networking.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-packetHandling.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-packetProcessing.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-t-log.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/run-utilities.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sntptest.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t-log.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto-crypto.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto-run-crypto.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_crypto-version.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utilities.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
@@ -1030,33 +1071,19 @@ test_crypto-run-crypto.obj: run-crypto.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -c -o test_crypto-run-crypto.obj `if test -f 'run-crypto.c'; then $(CYGPATH_W) 'run-crypto.c'; else $(CYGPATH_W) '$(srcdir)/run-crypto.c'; fi`
 
-test_crypto-version.o: $(top_builddir)/version.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -MT test_crypto-version.o -MD -MP -MF $(DEPDIR)/test_crypto-version.Tpo -c -o test_crypto-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
+test_crypto-version.o: version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -MT test_crypto-version.o -MD -MP -MF $(DEPDIR)/test_crypto-version.Tpo -c -o test_crypto-version.o `test -f 'version.c' || echo '$(srcdir)/'`version.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_crypto-version.Tpo $(DEPDIR)/test_crypto-version.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='test_crypto-version.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='version.c' object='test_crypto-version.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -c -o test_crypto-version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -c -o test_crypto-version.o `test -f 'version.c' || echo '$(srcdir)/'`version.c
 
-test_crypto-version.obj: $(top_builddir)/version.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -MT test_crypto-version.obj -MD -MP -MF $(DEPDIR)/test_crypto-version.Tpo -c -o test_crypto-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
+test_crypto-version.obj: version.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -MT test_crypto-version.obj -MD -MP -MF $(DEPDIR)/test_crypto-version.Tpo -c -o test_crypto-version.obj `if test -f 'version.c'; then $(CYGPATH_W) 'version.c'; else $(CYGPATH_W) '$(srcdir)/version.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_crypto-version.Tpo $(DEPDIR)/test_crypto-version.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='test_crypto-version.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -c -o test_crypto-version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
-
-version.o: $(top_builddir)/version.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT version.o -MD -MP -MF $(DEPDIR)/version.Tpo -c -o version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/version.Tpo $(DEPDIR)/version.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='version.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='version.c' object='test_crypto-version.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o version.o `test -f '$(top_builddir)/version.c' || echo '$(srcdir)/'`$(top_builddir)/version.c
-
-version.obj: $(top_builddir)/version.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT version.obj -MD -MP -MF $(DEPDIR)/version.Tpo -c -o version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/version.Tpo $(DEPDIR)/version.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_builddir)/version.c' object='version.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o version.obj `if test -f '$(top_builddir)/version.c'; then $(CYGPATH_W) '$(top_builddir)/version.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/version.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_crypto_CFLAGS) $(CFLAGS) -c -o test_crypto-version.obj `if test -f 'version.c'; then $(CYGPATH_W) 'version.c'; else $(CYGPATH_W) '$(srcdir)/version.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -1223,7 +1250,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
 	fi;								\
 	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
+	echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}";	\
 	echo "$${col}$$br$${std}"; 					\
 	create_testsuite_report --maybe-color;				\
 	echo "$$col$$br$$std";						\
@@ -1236,7 +1263,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	fi;								\
 	$$success || exit 1
 
-check-TESTS:
+check-TESTS: $(check_PROGRAMS) $(dist_check_SCRIPTS)
 	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
@@ -1334,8 +1361,10 @@ test-kodFile.log: test-kodFile$(EXEEXT)
 @am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
 @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
-distdir: $(DISTFILES)
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -1375,7 +1404,8 @@ all-am: Makefile $(HEADERS)
 installdirs:
 install: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
+install-exec: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 
@@ -1416,7 +1446,28 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/fileHandlingTest.Po
+	-rm -f ./$(DEPDIR)/keyFile.Po
+	-rm -f ./$(DEPDIR)/kodDatabase.Po
+	-rm -f ./$(DEPDIR)/kodFile.Po
+	-rm -f ./$(DEPDIR)/networking.Po
+	-rm -f ./$(DEPDIR)/packetHandling.Po
+	-rm -f ./$(DEPDIR)/packetProcessing.Po
+	-rm -f ./$(DEPDIR)/run-keyFile.Po
+	-rm -f ./$(DEPDIR)/run-kodDatabase.Po
+	-rm -f ./$(DEPDIR)/run-kodFile.Po
+	-rm -f ./$(DEPDIR)/run-networking.Po
+	-rm -f ./$(DEPDIR)/run-packetHandling.Po
+	-rm -f ./$(DEPDIR)/run-packetProcessing.Po
+	-rm -f ./$(DEPDIR)/run-t-log.Po
+	-rm -f ./$(DEPDIR)/run-utilities.Po
+	-rm -f ./$(DEPDIR)/sntptest.Po
+	-rm -f ./$(DEPDIR)/t-log.Po
+	-rm -f ./$(DEPDIR)/test_crypto-crypto.Po
+	-rm -f ./$(DEPDIR)/test_crypto-run-crypto.Po
+	-rm -f ./$(DEPDIR)/test_crypto-version.Po
+	-rm -f ./$(DEPDIR)/utilities.Po
+	-rm -f ./$(DEPDIR)/version.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -1462,7 +1513,28 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/fileHandlingTest.Po
+	-rm -f ./$(DEPDIR)/keyFile.Po
+	-rm -f ./$(DEPDIR)/kodDatabase.Po
+	-rm -f ./$(DEPDIR)/kodFile.Po
+	-rm -f ./$(DEPDIR)/networking.Po
+	-rm -f ./$(DEPDIR)/packetHandling.Po
+	-rm -f ./$(DEPDIR)/packetProcessing.Po
+	-rm -f ./$(DEPDIR)/run-keyFile.Po
+	-rm -f ./$(DEPDIR)/run-kodDatabase.Po
+	-rm -f ./$(DEPDIR)/run-kodFile.Po
+	-rm -f ./$(DEPDIR)/run-networking.Po
+	-rm -f ./$(DEPDIR)/run-packetHandling.Po
+	-rm -f ./$(DEPDIR)/run-packetProcessing.Po
+	-rm -f ./$(DEPDIR)/run-t-log.Po
+	-rm -f ./$(DEPDIR)/run-utilities.Po
+	-rm -f ./$(DEPDIR)/sntptest.Po
+	-rm -f ./$(DEPDIR)/t-log.Po
+	-rm -f ./$(DEPDIR)/test_crypto-crypto.Po
+	-rm -f ./$(DEPDIR)/test_crypto-run-crypto.Po
+	-rm -f ./$(DEPDIR)/test_crypto-version.Po
+	-rm -f ./$(DEPDIR)/utilities.Po
+	-rm -f ./$(DEPDIR)/version.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -1481,18 +1553,19 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: all check check-am install install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
-	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
-	ctags ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+.MAKE: all check check-am install install-am install-exec \
+	install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
+	check-am clean clean-checkPROGRAMS clean-generic clean-libtool \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	recheck tags tags-am uninstall uninstall-am
@@ -1526,31 +1599,45 @@ $(srcdir)/run-crypto.c: $(srcdir)/crypto.c $(std_unity_list)
 
 $(srcdir)/run-t-log.c: $(srcdir)/t-log.c $(std_unity_list)
 	$(run_unity) $< $@
+#if !NTP_CROSSCOMPILE
+#TESTS += tests-runner
+#endif
+
+version.c: Makefile $(top_srcdir)/scm-rev
+	$(AM_V_GEN)env CSET=`cat $(srcdir)/../scm-rev` $(top_builddir)/../scripts/build/mkver sntp-tests
+
+$(top_srcdir)/scm-rev: FRC.scm-rev
+	$(AM_V_GEN)cd .. && $(MAKE) $(AM_MAKEFLAGS) check-scm-rev
+
+FRC.scm-rev:
+	@: FRC.scm-rev "force" depends on nothing and is not a file, so is	\
+	   always out-of-date causing targets which depend on it to also	\
+	   be outdated so their rules to fire each time they are built.
 
-check-libsntp: ../libsntp.a
-	@echo stamp > $@
+check-libntp: $(top_builddir)/../libntp/libntp.a
+	@: avoid default SCCS get by some make implementations
 
-../libsntp.a:
-	cd .. && $(MAKE) $(AM_MAKEFLAGS) libsntp.a
+$(top_builddir)/../libntp/libntp.a:
+	cd $(top_builddir)/../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
 
-check-libntp: ../../libntp/libntp.a
-	@echo stamp > $@
+check-libsntp: $(top_builddir)/sntp/libsntp.a
+	@: avoid default SCCS get by some make implementations
 
-../../libntp/libntp.a:
-	cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
+$(top_builddir)/sntp/libsntp.a:
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) libsntp.a
 
-check-libunity: ../unity/libunity.a
-	@echo stamp > $@
+check-libunity: $(top_builddir)/unity/libunity.a
+	 @: avoid default SCCS get by some make implementations
 
-../unity/libunity.a:
-	cd ../unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
+$(top_builddir)/unity/libunity.a:
+	cd $(top_builddir)/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
 $(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver
 	@[ -f $@ ] ||							\
 		cp $(top_srcdir)/deps-ver $@
 	@[ -w $@ ] ||							\
-		chmod ug+w $@
+		chmod u+w $@
 	@cmp $(top_srcdir)/deps-ver $@ > /dev/null || (			\
-		$(MAKE) $(AM_MAKEFLAGS) clean &&					\
+		$(MAKE) $(AM_MAKEFLAGS) clean &&			\
 		echo -n "Prior $(subdir)/$(DEPDIR) version " &&		\
 		cat $@ &&						\
 		rm -rf $(DEPDIR) &&					\
@@ -1568,7 +1655,7 @@ $(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver
 		echo -n "Cleaned $(subdir)/$(DEPDIR) version " &&	\
 		cat $(top_srcdir)/deps-ver				\
 	)
-	cp $(top_srcdir)/deps-ver $@
+	$(AM_V_at)cp $(top_srcdir)/deps-ver $@
 
 .deps-ver: $(top_srcdir)/deps-ver
 	@[ ! -d $(DEPDIR) ] || $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/deps-ver
@@ -1598,7 +1685,7 @@ $(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver
 # If you modify depsver.mf, please make the changes to the master
 # copy, the one in sntp is copied by the bootstrap script from it.
 #
-# This comment block follows rather than leads the related code so that
+# This comment block follows rather than leads the related rules so that
 # it stays with it in the generated Makefile.in and Makefile.
 #
 
diff --git a/contrib/ntp/sntp/tests/packetProcessing.c b/contrib/ntp/sntp/tests/packetProcessing.c
index 9c9f061c4aee..53c454a9f064 100644
--- a/contrib/ntp/sntp/tests/packetProcessing.c
+++ b/contrib/ntp/sntp/tests/packetProcessing.c
@@ -9,8 +9,6 @@
 #define CMAC_LENGTH	16
 
 
-const char * Version = "stub unit test Version string";
-
 /* Hacks into the key database. */
 extern struct key* key_ptr;
 extern int key_cnt;
diff --git a/contrib/ntp/sntp/tests/sntptest.c b/contrib/ntp/sntp/tests/sntptest.c
index 73c1ad26f396..cb08d371ab75 100644
--- a/contrib/ntp/sntp/tests/sntptest.c
+++ b/contrib/ntp/sntp/tests/sntptest.c
@@ -1,7 +1,5 @@
 
 #include "config.h"
-#include "ntp_stdlib.h"
-#include "sntp-opts.h"
 #include "sntptest.h"
 
 void
@@ -28,6 +26,6 @@ ActivateOption(const char* option, const char* argument) {
 	opts[2] = estrdup(argument);
 	opts[3] = estrdup("127.0.0.1");
 
-	optionProcess(&sntpOptions, ARGV_SIZE, opts);
+	optionProcess(&sntpOptions, COUNTOF(opts), opts);
 }
 
diff --git a/contrib/ntp/sntp/tests/sntptest.h b/contrib/ntp/sntp/tests/sntptest.h
index 82e2562dd290..05a6d5db4cbf 100644
--- a/contrib/ntp/sntp/tests/sntptest.h
+++ b/contrib/ntp/sntp/tests/sntptest.h
@@ -2,6 +2,7 @@
 #define SNTPTEST_H
 
 #include "ntp_stdlib.h"
+#include "ntp_types.h"
 #include "sntp-opts.h"
 
 void sntptest(void);
diff --git a/contrib/ntp/sntp/tests/t-log.c b/contrib/ntp/sntp/tests/t-log.c
index 08d4b6c59b2f..7b935c302326 100644
--- a/contrib/ntp/sntp/tests/t-log.c
+++ b/contrib/ntp/sntp/tests/t-log.c
@@ -3,7 +3,6 @@
 #include "ntp_types.h"
 
 
-//#include "log.h"
 #include "log.c"
 
 void setUp(void);
diff --git a/contrib/ntp/sntp/tests/utilities.c b/contrib/ntp/sntp/tests/utilities.c
index a68aaacae9ae..aeeee4b2cf47 100644
--- a/contrib/ntp/sntp/tests/utilities.c
+++ b/contrib/ntp/sntp/tests/utilities.c
@@ -22,9 +22,6 @@ void test_LfpOutputBinaryFormat(void);
 void test_LfpOutputDecimalFormat(void);
 
 
-const char * Version = "stub unit test Version string";
-
-
 sockaddr_u
 CreateSockaddr4(const char* address) {
 	sockaddr_u s;