From: Dave Hart Date: Thu, 26 Jan 2023 08:09:16 +0000 (-0500) Subject: Enable Automake's subdir-objects option quieting warnings and X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0572ef2105b24397c51a3bed5aadeea8ce7e2e4;p=thirdparty%2Fntp.git Enable Automake's subdir-objects option quieting warnings and building .o files in corresponding build subdirs to the source subdirs. [Bug 2525] Centralize more logic to build prereq. libraries in included .mf files. Fix building without OpenSSL where arc4random() is available. Fix building without refclock support. Fix make maintainer-clean and thereby distcheck re deps-ver files. bk: 63d2352c2sCfbfNEaJ7iRNmBgJA-sg --- diff --git a/ChangeLog b/ChangeLog index 8efd42d93..2e950b87c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ --- +* [Bug 2525] Turn on automake subdir-objects across the project. * [Bug 3758] Provide a 'device' config statement for refclocks * [Bug 3757] Improve handling of Linux-PPS in NTPD * [Bug 3741] 4.2.8p15 can't build with glibc 2.34 @@ -8,7 +9,7 @@ * [Bug 3699] Problems handling drift file and restoring previous drifts - command line options override config statements where applicable - make initial frequency settings idempotent and reversible - - make sure kernel PLL gets a revovered drift componsation + - make sure kernel PLL gets a recovered drift componsation * [Bug 3695] Fix memory leak with ntpq on Windows Server 2019 * [Bug 3694] NMEA refclock seems to unnecessarily require location in messages - misleading title; essentially a request to ignore the receiver status. @@ -24,8 +25,8 @@ - patch by Frank Kardel * [Bug 3689] Extension for MD5, SHA-1 and other keys - ntp{q,dc} now use the same password processing as ntpd does in the key - file, so havin a binary secret >= 11 bytes is possible for all keys. - (This is a different approach to the roblem than suggested) + file, so having a binary secret >= 11 bytes is possible for all keys. + (This is a different approach to the problem than suggested) * [Bug 3688] GCC 10 build errors in testsuite * [Bug 3687] ntp_crypto_rand RNG status not known - patch by Gerry Garvey @@ -63,8 +64,7 @@ * [Bug 3662] Fix build errors on Windows with VS2008 * [Bug 3660] Manycast orphan mode startup discovery problem. - integrated patch from Charles Claggett -* [Bug 3659] Move definition of psl[] from ntp_config.h to - ntp_config.h +* [Bug 3659] Move definition of psl[] from ntp_config.h to ntp_config.c * [Bug 3657] Wrong "Autokey group mismatch" debug message * [Bug 3655] ntpdc memstats hash counts - fix by Gerry garvey diff --git a/Makefile.am b/Makefile.am index 7c95863d8..72c35cb0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,7 +52,6 @@ EXTRA_DIST = \ \ conf \ html \ - lib/isc \ libjsmn \ ports \ \ diff --git a/adjtimed/Makefile.am b/adjtimed/Makefile.am index 19bfe0c95..87c12b393 100644 --- a/adjtimed/Makefile.am +++ b/adjtimed/Makefile.am @@ -6,6 +6,7 @@ sbin_PROGRAMS = $(ADJTIMED_DS) BUILT_SOURCES = CLEANFILES = +DISTCLEANFILES = EXTRA_PROGRAMS = adjtimed AM_CFLAGS = $(CFLAGS_NTP) @@ -19,6 +20,6 @@ LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS) AM_LDFLAGS = $(NTP_HARD_LDFLAGS) include $(top_srcdir)/bincheck.mf -include $(top_srcdir)/sntp/check-libntp.mf +include $(top_srcdir)/check-libntp.mf include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/check-libntp.mf b/check-libntp.mf new file mode 100644 index 000000000..07c855b4b --- /dev/null +++ b/check-libntp.mf @@ -0,0 +1,14 @@ +## check-libntp.mf - automake fragment +## +## sntp/check-libntp.mf +## The above file has a version of this for the sntp tree. + +BUILT_SOURCES += check-libntp +CLEANFILES += check-libntp + +check-libntp: $(top_builddir)/libntp/libntp.a + @: avoid default SCCS get by some make implementations + +$(top_builddir)/libntp/libntp.a: + cd $(top_builddir)/libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a + diff --git a/check-libntpd.mf b/check-libntpd.mf new file mode 100644 index 000000000..46304dd5f --- /dev/null +++ b/check-libntpd.mf @@ -0,0 +1,19 @@ +## +## check-libntpd.mf - automake fragment +## + +BUILT_SOURCES += check-libntpd + +# CLEANFILES addition below won't be needed after a while. +# Leave it in for now for folks tracking the source repo +# who have the file from a former version of the rule. +# DLH Jan 2023 + +CLEANFILES += check-libntpd + +check-libntpd: $(top_builddir)/ntpd/libntpd.a + @: avoid default SCCS get by some make implementations + +$(top_builddir)/ntpd/libntpd.a: + cd $(top_builddir)/ntpd && $(MAKE) $(AM_MAKEFLAGS) libntpd.a + diff --git a/check-libunity.mf b/check-libunity.mf new file mode 100644 index 000000000..4e052058c --- /dev/null +++ b/check-libunity.mf @@ -0,0 +1,13 @@ +## check-libunity.mf - automake fragment +## +## sntp/check-libunity.mf +## The above file has a version of this for the sntp tree. + +BUILT_SOURCES += check-libunity + +check-libunity: $(top_builddir)/sntp/unity/libunity.a + @: avoid default SCCS get by some make implementations + +$(top_builddir)/sntp/unity/libunity.a: + cd $(top_builddir)/sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a + diff --git a/clockstuff/Makefile.am b/clockstuff/Makefile.am index 27984e9df..5b3f59f84 100644 --- a/clockstuff/Makefile.am +++ b/clockstuff/Makefile.am @@ -14,7 +14,8 @@ propdelay_LDADD = $(LDADD) BUILT_SOURCES = CLEANFILES = +DISTCLEANFILES = -include $(top_srcdir)/sntp/check-libntp.mf +include $(top_srcdir)/check-libntp.mf include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/configure.ac b/configure.ac index b77940d7b..e06d7e9cc 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,7 @@ ntp_configure_cache_version=20120806 NTP_CACHEVERSION([main], [$ntp_configure_cache_version]) -AM_INIT_AUTOMAKE([1.15 foreign -Wall -Wno-gnu]) +AM_INIT_AUTOMAKE([1.15 foreign subdir-objects -Wall -Wno-gnu]) AM_SILENT_RULES([yes]) @@ -76,11 +76,7 @@ NTP_VPATH_HACK dnl used only by ntpd/Makefile.am NTP_LOCINFO([sntp]) dnl takes over from NTP_BINDIR, in NTP_LIBNTP -dnl AM_PROG_AR req. automake 1.12 -m4_ifdef( - [AM_PROG_AR], - [AM_PROG_AR] -) +AM_PROG_AR # So far, the only shared library we might use is libopts. # It's a small library - we might as well use a static version of it. diff --git a/deps-ver b/deps-ver index 16d66a8bd..abd139968 100644 --- a/deps-ver +++ b/deps-ver @@ -1 +1 @@ -Fri Dec 30 11:24:57 UTC 2011 +Mon Jan 16 09:26:08 UTC 2023 diff --git a/depsver.mf b/depsver.mf index 695f7303c..39a287b6b 100644 --- a/depsver.mf +++ b/depsver.mf @@ -2,9 +2,9 @@ $(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) && \ @@ -30,6 +30,7 @@ $(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver BUILT_SOURCES += .deps-ver CLEANFILES += .deps-ver +DISTCLEANFILES += $(DEPDIR)/deps-ver # # depsver.mf included in Makefile.am for directories with .deps diff --git a/includes.mf b/includes.mf index e868ba470..e34b908cc 100644 --- a/includes.mf +++ b/includes.mf @@ -1,6 +1,6 @@ ## includes.mf - automake fragment NTP_INCS = -I$(top_srcdir)/include -NTP_INCS += -I$(top_srcdir)/lib/isc/include -NTP_INCS += -I$(top_srcdir)/lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include -NTP_INCS += -I$(top_srcdir)/lib/isc/unix/include +NTP_INCS += -I$(top_srcdir)/libntp/lib/isc/include +NTP_INCS += -I$(top_srcdir)/libntp/lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include +NTP_INCS += -I$(top_srcdir)/libntp/lib/isc/unix/include diff --git a/libntp/Makefile.am b/libntp/Makefile.am index 54dbdf1e8..99ce273d4 100644 --- a/libntp/Makefile.am +++ b/libntp/Makefile.am @@ -1,46 +1,147 @@ NULL= BUILT_SOURCES = CLEANFILES = +DISTCLEANFILES = noinst_LIBRARIES = libntp.a @MAKE_LIBNTPSIM@ EXTRA_LIBRARIES = libntpsim.a -libisc_SRCS = \ - $(srcdir)/../lib/isc/assertions.c \ - $(srcdir)/../lib/isc/buffer.c \ - $(srcdir)/../lib/isc/backtrace-emptytbl.c \ - $(srcdir)/../lib/isc/backtrace.c \ - $(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/condition.c \ - $(srcdir)/../lib/isc/unix/dir.c \ - $(srcdir)/../lib/isc/error.c \ - $(srcdir)/../lib/isc/unix/errno2result.c \ - $(srcdir)/../lib/isc/event.c \ - $(srcdir)/../lib/isc/unix/file.c \ - $(srcdir)/../lib/isc/inet_ntop.c \ - $(srcdir)/../lib/isc/inet_pton.c \ - $(srcdir)/../lib/isc/unix/interfaceiter.c \ - $(srcdir)/../lib/isc/lib.c \ - $(srcdir)/../lib/isc/log.c \ - $(srcdir)/../lib/isc/md5.c \ - $(srcdir)/../lib/isc/nls/msgcat.c \ - $(srcdir)/../lib/isc/unix/net.c \ - $(srcdir)/../lib/isc/netaddr.c \ - $(srcdir)/../lib/isc/netscope.c \ - $(srcdir)/../lib/isc/ondestroy.c \ - $(srcdir)/../lib/isc/random.c \ - $(srcdir)/../lib/isc/result.c \ - $(srcdir)/../lib/isc/unix/stdio.c \ - $(srcdir)/../lib/isc/unix/stdtime.c \ - $(srcdir)/../lib/isc/unix/strerror.c \ - $(srcdir)/../lib/isc/task.c \ - $(srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/thread.c \ - $(srcdir)/../lib/isc/unix/time.c \ - $(srcdir)/../lib/isc/sha1.c \ - $(srcdir)/../lib/isc/sockaddr.c \ - $(srcdir)/../lib/isc/tsmemcmp.c \ +noinst_HEADERS = \ + lib/isc/task_p.h \ + lib/isc/include/isc/app.h \ + lib/isc/include/isc/assertions.h \ + lib/isc/include/isc/backtrace.h \ + lib/isc/include/isc/bind9.h \ + lib/isc/include/isc/buffer.h \ + lib/isc/include/isc/boolean.h \ + lib/isc/include/isc/error.h \ + lib/isc/include/isc/event.h \ + lib/isc/include/isc/eventclass.h \ + lib/isc/include/isc/file.h \ + lib/isc/include/isc/formatcheck.h \ + lib/isc/include/isc/hash.h \ + lib/isc/include/isc/interfaceiter.h \ + lib/isc/include/isc/lang.h \ + lib/isc/include/isc/lib.h \ + lib/isc/include/isc/list.h \ + lib/isc/include/isc/log.h \ + lib/isc/include/isc/magic.h \ + lib/isc/include/isc/md5.h \ + lib/isc/include/isc/msgs.h \ + lib/isc/include/isc/msgcat.h \ + lib/isc/include/isc/namespace.h \ + lib/isc/include/isc/netscope.h \ + lib/isc/include/isc/netaddr.h \ + lib/isc/include/isc/ondestroy.h \ + lib/isc/include/isc/platform.h \ + lib/isc/include/isc/print.h \ + lib/isc/include/isc/random.h \ + lib/isc/include/isc/region.h \ + lib/isc/include/isc/result.h \ + lib/isc/include/isc/resultclass.h \ + lib/isc/include/isc/sha1.h \ + lib/isc/include/isc/sockaddr.h \ + lib/isc/include/isc/socket.h \ + lib/isc/include/isc/stdio.h \ + lib/isc/include/isc/string.h \ + lib/isc/include/isc/task.h \ + lib/isc/include/isc/timer.h \ + lib/isc/include/isc/types.h \ + lib/isc/include/isc/util.h \ + lib/isc/include/isc/xml.h \ + lib/isc/unix/errno2result.h \ + lib/isc/unix/include/isc/dir.h \ + lib/isc/unix/include/isc/int.h \ + lib/isc/unix/include/isc/net.h \ + lib/isc/unix/include/isc/offset.h \ + lib/isc/unix/include/isc/stat.h \ + lib/isc/unix/include/isc/stdtime.h \ + lib/isc/unix/include/isc/strerror.h \ + lib/isc/unix/include/isc/time.h \ + lib/isc/win32/include/isc/condition.h \ + lib/isc/win32/include/isc/dir.h \ + lib/isc/win32/include/isc/int.h \ + lib/isc/win32/include/isc/ipv6.h \ + lib/isc/win32/include/isc/mutex.h \ + lib/isc/win32/include/isc/net.h \ + lib/isc/win32/include/isc/offset.h \ + lib/isc/win32/include/isc/once.h \ + lib/isc/win32/include/isc/platform.h \ + lib/isc/win32/include/isc/stat.h \ + lib/isc/win32/include/isc/stdtime.h \ + lib/isc/win32/include/isc/strerror.h \ + lib/isc/win32/include/isc/thread.h \ + lib/isc/win32/include/isc/time.h \ + lib/isc/win32/include/isc/win32os.h \ + $(NULL) + + +# ntp_crypto_rnd.c includes libevent headers for use when +# neither OpenSSL nor arc4random_buf are available. Those +# include event2/event-config.h which is built, so if we +# are building our libevent tearoff, build it before this. + +if BUILD_LIBEVENT +BUILT_SOURCES += libevent_first +CLEANFILES += libevent_first + +libevent_first: + cd $(top_builddir)/sntp/libevent && $(MAKE) $(AM_MAKEFLAGS) + echo stamp > $@ +endif + + +libisc_SRCS = \ + lib/isc/assertions.c \ + lib/isc/buffer.c \ + lib/isc/backtrace-emptytbl.c \ + lib/isc/backtrace.c \ + lib/isc/unix/dir.c \ + lib/isc/error.c \ + lib/isc/unix/errno2result.c \ + lib/isc/event.c \ + lib/isc/unix/file.c \ + lib/isc/inet_ntop.c \ + lib/isc/inet_pton.c \ + lib/isc/unix/interfaceiter.c \ + lib/isc/lib.c \ + lib/isc/log.c \ + lib/isc/md5.c \ + lib/isc/nls/msgcat.c \ + lib/isc/unix/net.c \ + lib/isc/netaddr.c \ + lib/isc/netscope.c \ + lib/isc/ondestroy.c \ + lib/isc/random.c \ + lib/isc/result.c \ + lib/isc/unix/stdio.c \ + lib/isc/unix/stdtime.c \ + lib/isc/unix/strerror.c \ + lib/isc/task.c \ + lib/isc/unix/time.c \ + lib/isc/sha1.c \ + lib/isc/sockaddr.c \ + lib/isc/tsmemcmp.c \ + $(NULL) + +libisc_XTRA = \ + lib/isc/pthreads/condition.c \ + lib/isc/pthreads/mutex.c \ + lib/isc/pthreads/thread.c \ + lib/isc/nothreads/condition.c \ + lib/isc/nothreads/thread.c \ $(NULL) if PTHREADS -libisc_SRCS += $(srcdir)/../lib/isc/pthreads/mutex.c +libisc_SRCS += \ + lib/isc/pthreads/condition.c \ + lib/isc/pthreads/mutex.c \ + lib/isc/pthreads/thread.c \ + $(NULL) +else +libisc_SRCS += \ + lib/isc/nothreads/condition.c \ + lib/isc/nothreads/thread.c \ + $(NULL) endif libntp_a_SRCS = \ @@ -121,19 +222,40 @@ libntp_a_SRCS = \ libntp_a_SOURCES = systime.c $(libntp_a_SRCS) libntpsim_a_SOURCES = systime_s.c $(libntp_a_SRCS) -EXTRA_libntp_a_SOURCES = adjtimex.c + +EXTRA_libntp_a_SOURCES = \ + adjtimex.c \ + $(libisc_XTRA) \ + $(NULL) AM_CFLAGS = $(CFLAGS_NTP) AM_CFLAGS += $(NTP_HARD_CFLAGS) AM_CPPFLAGS = $(NTP_INCS) AM_CPPFLAGS += $(LIBOPTS_CFLAGS) +AM_CPPFLAGS += $(CPPFLAGS_LIBEVENT) AM_CPPFLAGS += $(CPPFLAGS_NTP) AM_CPPFLAGS += $(NTP_HARD_CPPFLAGS) AM_LDFLAGS = $(NTP_HARD_LDFLAGS) -EXTRA_DIST = README +EXTRA_DIST = \ + README \ + lib/isc/nothreads/include \ + lib/isc/pthreads/include \ + lib/isc/unix/ifiter_getifaddrs.c \ + lib/isc/unix/ifiter_ioctl.c \ + lib/isc/unix/ifiter_sysctl.c \ + lib/isc/win32/condition.c \ + lib/isc/win32/interfaceiter.c \ + lib/isc/win32/net.c \ + lib/isc/win32/once.c \ + lib/isc/win32/stdtime.c \ + lib/isc/win32/strerror.c \ + lib/isc/win32/thread.c \ + lib/isc/win32/time.c \ + lib/isc/win32/win32os.c \ + $(NULL) include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/lib/isc/Atffile b/libntp/lib/isc/Atffile similarity index 100% rename from lib/isc/Atffile rename to libntp/lib/isc/Atffile diff --git a/lib/isc/alpha/include/isc/atomic.h b/libntp/lib/isc/alpha/include/isc/atomic.h similarity index 100% rename from lib/isc/alpha/include/isc/atomic.h rename to libntp/lib/isc/alpha/include/isc/atomic.h diff --git a/lib/isc/api b/libntp/lib/isc/api similarity index 100% rename from lib/isc/api rename to libntp/lib/isc/api diff --git a/lib/isc/app_api.c b/libntp/lib/isc/app_api.c similarity index 100% rename from lib/isc/app_api.c rename to libntp/lib/isc/app_api.c diff --git a/lib/isc/assertions.c b/libntp/lib/isc/assertions.c similarity index 100% rename from lib/isc/assertions.c rename to libntp/lib/isc/assertions.c diff --git a/lib/isc/backtrace-emptytbl.c b/libntp/lib/isc/backtrace-emptytbl.c similarity index 100% rename from lib/isc/backtrace-emptytbl.c rename to libntp/lib/isc/backtrace-emptytbl.c diff --git a/lib/isc/backtrace.c b/libntp/lib/isc/backtrace.c similarity index 100% rename from lib/isc/backtrace.c rename to libntp/lib/isc/backtrace.c diff --git a/lib/isc/base32.c b/libntp/lib/isc/base32.c similarity index 100% rename from lib/isc/base32.c rename to libntp/lib/isc/base32.c diff --git a/lib/isc/base64.c b/libntp/lib/isc/base64.c similarity index 100% rename from lib/isc/base64.c rename to libntp/lib/isc/base64.c diff --git a/lib/isc/bitstring.c b/libntp/lib/isc/bitstring.c similarity index 100% rename from lib/isc/bitstring.c rename to libntp/lib/isc/bitstring.c diff --git a/lib/isc/buffer.c b/libntp/lib/isc/buffer.c similarity index 100% rename from lib/isc/buffer.c rename to libntp/lib/isc/buffer.c diff --git a/lib/isc/bufferlist.c b/libntp/lib/isc/bufferlist.c similarity index 100% rename from lib/isc/bufferlist.c rename to libntp/lib/isc/bufferlist.c diff --git a/lib/isc/commandline.c b/libntp/lib/isc/commandline.c similarity index 100% rename from lib/isc/commandline.c rename to libntp/lib/isc/commandline.c diff --git a/lib/isc/entropy.c b/libntp/lib/isc/entropy.c similarity index 100% rename from lib/isc/entropy.c rename to libntp/lib/isc/entropy.c diff --git a/lib/isc/error.c b/libntp/lib/isc/error.c similarity index 100% rename from lib/isc/error.c rename to libntp/lib/isc/error.c diff --git a/lib/isc/event.c b/libntp/lib/isc/event.c similarity index 100% rename from lib/isc/event.c rename to libntp/lib/isc/event.c diff --git a/lib/isc/fsaccess.c b/libntp/lib/isc/fsaccess.c similarity index 100% rename from lib/isc/fsaccess.c rename to libntp/lib/isc/fsaccess.c diff --git a/lib/isc/hash.c b/libntp/lib/isc/hash.c similarity index 100% rename from lib/isc/hash.c rename to libntp/lib/isc/hash.c diff --git a/lib/isc/heap.c b/libntp/lib/isc/heap.c similarity index 100% rename from lib/isc/heap.c rename to libntp/lib/isc/heap.c diff --git a/lib/isc/hex.c b/libntp/lib/isc/hex.c similarity index 100% rename from lib/isc/hex.c rename to libntp/lib/isc/hex.c diff --git a/lib/isc/hmacmd5.c b/libntp/lib/isc/hmacmd5.c similarity index 100% rename from lib/isc/hmacmd5.c rename to libntp/lib/isc/hmacmd5.c diff --git a/lib/isc/hmacsha.c b/libntp/lib/isc/hmacsha.c similarity index 100% rename from lib/isc/hmacsha.c rename to libntp/lib/isc/hmacsha.c diff --git a/lib/isc/httpd.c b/libntp/lib/isc/httpd.c similarity index 100% rename from lib/isc/httpd.c rename to libntp/lib/isc/httpd.c diff --git a/lib/isc/ia64/include/isc/atomic.h b/libntp/lib/isc/ia64/include/isc/atomic.h similarity index 100% rename from lib/isc/ia64/include/isc/atomic.h rename to libntp/lib/isc/ia64/include/isc/atomic.h diff --git a/lib/isc/include/isc/app.h b/libntp/lib/isc/include/isc/app.h similarity index 100% rename from lib/isc/include/isc/app.h rename to libntp/lib/isc/include/isc/app.h diff --git a/lib/isc/include/isc/assertions.h b/libntp/lib/isc/include/isc/assertions.h similarity index 100% rename from lib/isc/include/isc/assertions.h rename to libntp/lib/isc/include/isc/assertions.h diff --git a/lib/isc/include/isc/backtrace.h b/libntp/lib/isc/include/isc/backtrace.h similarity index 100% rename from lib/isc/include/isc/backtrace.h rename to libntp/lib/isc/include/isc/backtrace.h diff --git a/lib/isc/include/isc/base32.h b/libntp/lib/isc/include/isc/base32.h similarity index 100% rename from lib/isc/include/isc/base32.h rename to libntp/lib/isc/include/isc/base32.h diff --git a/lib/isc/include/isc/base64.h b/libntp/lib/isc/include/isc/base64.h similarity index 100% rename from lib/isc/include/isc/base64.h rename to libntp/lib/isc/include/isc/base64.h diff --git a/lib/isc/include/isc/bind9.h b/libntp/lib/isc/include/isc/bind9.h similarity index 100% rename from lib/isc/include/isc/bind9.h rename to libntp/lib/isc/include/isc/bind9.h diff --git a/lib/isc/include/isc/bitstring.h b/libntp/lib/isc/include/isc/bitstring.h similarity index 100% rename from lib/isc/include/isc/bitstring.h rename to libntp/lib/isc/include/isc/bitstring.h diff --git a/lib/isc/include/isc/boolean.h b/libntp/lib/isc/include/isc/boolean.h similarity index 100% rename from lib/isc/include/isc/boolean.h rename to libntp/lib/isc/include/isc/boolean.h diff --git a/lib/isc/include/isc/buffer.h b/libntp/lib/isc/include/isc/buffer.h similarity index 100% rename from lib/isc/include/isc/buffer.h rename to libntp/lib/isc/include/isc/buffer.h diff --git a/lib/isc/include/isc/bufferlist.h b/libntp/lib/isc/include/isc/bufferlist.h similarity index 100% rename from lib/isc/include/isc/bufferlist.h rename to libntp/lib/isc/include/isc/bufferlist.h diff --git a/lib/isc/include/isc/commandline.h b/libntp/lib/isc/include/isc/commandline.h similarity index 100% rename from lib/isc/include/isc/commandline.h rename to libntp/lib/isc/include/isc/commandline.h diff --git a/lib/isc/include/isc/entropy.h b/libntp/lib/isc/include/isc/entropy.h similarity index 100% rename from lib/isc/include/isc/entropy.h rename to libntp/lib/isc/include/isc/entropy.h diff --git a/lib/isc/include/isc/error.h b/libntp/lib/isc/include/isc/error.h similarity index 100% rename from lib/isc/include/isc/error.h rename to libntp/lib/isc/include/isc/error.h diff --git a/lib/isc/include/isc/event.h b/libntp/lib/isc/include/isc/event.h similarity index 100% rename from lib/isc/include/isc/event.h rename to libntp/lib/isc/include/isc/event.h diff --git a/lib/isc/include/isc/eventclass.h b/libntp/lib/isc/include/isc/eventclass.h similarity index 100% rename from lib/isc/include/isc/eventclass.h rename to libntp/lib/isc/include/isc/eventclass.h diff --git a/lib/isc/include/isc/file.h b/libntp/lib/isc/include/isc/file.h similarity index 100% rename from lib/isc/include/isc/file.h rename to libntp/lib/isc/include/isc/file.h diff --git a/lib/isc/include/isc/formatcheck.h b/libntp/lib/isc/include/isc/formatcheck.h similarity index 100% rename from lib/isc/include/isc/formatcheck.h rename to libntp/lib/isc/include/isc/formatcheck.h diff --git a/lib/isc/include/isc/fsaccess.h b/libntp/lib/isc/include/isc/fsaccess.h similarity index 100% rename from lib/isc/include/isc/fsaccess.h rename to libntp/lib/isc/include/isc/fsaccess.h diff --git a/lib/isc/include/isc/hash.h b/libntp/lib/isc/include/isc/hash.h similarity index 100% rename from lib/isc/include/isc/hash.h rename to libntp/lib/isc/include/isc/hash.h diff --git a/lib/isc/include/isc/heap.h b/libntp/lib/isc/include/isc/heap.h similarity index 100% rename from lib/isc/include/isc/heap.h rename to libntp/lib/isc/include/isc/heap.h diff --git a/lib/isc/include/isc/hex.h b/libntp/lib/isc/include/isc/hex.h similarity index 100% rename from lib/isc/include/isc/hex.h rename to libntp/lib/isc/include/isc/hex.h diff --git a/lib/isc/include/isc/hmacmd5.h b/libntp/lib/isc/include/isc/hmacmd5.h similarity index 100% rename from lib/isc/include/isc/hmacmd5.h rename to libntp/lib/isc/include/isc/hmacmd5.h diff --git a/lib/isc/include/isc/hmacsha.h b/libntp/lib/isc/include/isc/hmacsha.h similarity index 100% rename from lib/isc/include/isc/hmacsha.h rename to libntp/lib/isc/include/isc/hmacsha.h diff --git a/lib/isc/include/isc/httpd.h b/libntp/lib/isc/include/isc/httpd.h similarity index 100% rename from lib/isc/include/isc/httpd.h rename to libntp/lib/isc/include/isc/httpd.h diff --git a/lib/isc/include/isc/interfaceiter.h b/libntp/lib/isc/include/isc/interfaceiter.h similarity index 100% rename from lib/isc/include/isc/interfaceiter.h rename to libntp/lib/isc/include/isc/interfaceiter.h diff --git a/lib/isc/include/isc/ipv6.h b/libntp/lib/isc/include/isc/ipv6.h similarity index 100% rename from lib/isc/include/isc/ipv6.h rename to libntp/lib/isc/include/isc/ipv6.h diff --git a/lib/isc/include/isc/iterated_hash.h b/libntp/lib/isc/include/isc/iterated_hash.h similarity index 100% rename from lib/isc/include/isc/iterated_hash.h rename to libntp/lib/isc/include/isc/iterated_hash.h diff --git a/lib/isc/include/isc/lang.h b/libntp/lib/isc/include/isc/lang.h similarity index 100% rename from lib/isc/include/isc/lang.h rename to libntp/lib/isc/include/isc/lang.h diff --git a/lib/isc/include/isc/lex.h b/libntp/lib/isc/include/isc/lex.h similarity index 100% rename from lib/isc/include/isc/lex.h rename to libntp/lib/isc/include/isc/lex.h diff --git a/lib/isc/include/isc/lfsr.h b/libntp/lib/isc/include/isc/lfsr.h similarity index 100% rename from lib/isc/include/isc/lfsr.h rename to libntp/lib/isc/include/isc/lfsr.h diff --git a/lib/isc/include/isc/lib.h b/libntp/lib/isc/include/isc/lib.h similarity index 100% rename from lib/isc/include/isc/lib.h rename to libntp/lib/isc/include/isc/lib.h diff --git a/lib/isc/include/isc/list.h b/libntp/lib/isc/include/isc/list.h similarity index 100% rename from lib/isc/include/isc/list.h rename to libntp/lib/isc/include/isc/list.h diff --git a/lib/isc/include/isc/log.h b/libntp/lib/isc/include/isc/log.h similarity index 100% rename from lib/isc/include/isc/log.h rename to libntp/lib/isc/include/isc/log.h diff --git a/lib/isc/include/isc/magic.h b/libntp/lib/isc/include/isc/magic.h similarity index 100% rename from lib/isc/include/isc/magic.h rename to libntp/lib/isc/include/isc/magic.h diff --git a/lib/isc/include/isc/md5.h b/libntp/lib/isc/include/isc/md5.h similarity index 100% rename from lib/isc/include/isc/md5.h rename to libntp/lib/isc/include/isc/md5.h diff --git a/lib/isc/include/isc/mem.h b/libntp/lib/isc/include/isc/mem.h similarity index 100% rename from lib/isc/include/isc/mem.h rename to libntp/lib/isc/include/isc/mem.h diff --git a/lib/isc/include/isc/msgcat.h b/libntp/lib/isc/include/isc/msgcat.h similarity index 100% rename from lib/isc/include/isc/msgcat.h rename to libntp/lib/isc/include/isc/msgcat.h diff --git a/lib/isc/include/isc/msgs.h b/libntp/lib/isc/include/isc/msgs.h similarity index 100% rename from lib/isc/include/isc/msgs.h rename to libntp/lib/isc/include/isc/msgs.h diff --git a/lib/isc/include/isc/mutexblock.h b/libntp/lib/isc/include/isc/mutexblock.h similarity index 100% rename from lib/isc/include/isc/mutexblock.h rename to libntp/lib/isc/include/isc/mutexblock.h diff --git a/lib/isc/include/isc/namespace.h b/libntp/lib/isc/include/isc/namespace.h similarity index 100% rename from lib/isc/include/isc/namespace.h rename to libntp/lib/isc/include/isc/namespace.h diff --git a/lib/isc/include/isc/netaddr.h b/libntp/lib/isc/include/isc/netaddr.h similarity index 100% rename from lib/isc/include/isc/netaddr.h rename to libntp/lib/isc/include/isc/netaddr.h diff --git a/lib/isc/include/isc/netscope.h b/libntp/lib/isc/include/isc/netscope.h similarity index 100% rename from lib/isc/include/isc/netscope.h rename to libntp/lib/isc/include/isc/netscope.h diff --git a/lib/isc/include/isc/ondestroy.h b/libntp/lib/isc/include/isc/ondestroy.h similarity index 100% rename from lib/isc/include/isc/ondestroy.h rename to libntp/lib/isc/include/isc/ondestroy.h diff --git a/lib/isc/include/isc/os.h b/libntp/lib/isc/include/isc/os.h similarity index 100% rename from lib/isc/include/isc/os.h rename to libntp/lib/isc/include/isc/os.h diff --git a/lib/isc/include/isc/parseint.h b/libntp/lib/isc/include/isc/parseint.h similarity index 100% rename from lib/isc/include/isc/parseint.h rename to libntp/lib/isc/include/isc/parseint.h diff --git a/lib/isc/include/isc/platform.h b/libntp/lib/isc/include/isc/platform.h similarity index 100% rename from lib/isc/include/isc/platform.h rename to libntp/lib/isc/include/isc/platform.h diff --git a/lib/isc/include/isc/platform.h.in b/libntp/lib/isc/include/isc/platform.h.in similarity index 100% rename from lib/isc/include/isc/platform.h.in rename to libntp/lib/isc/include/isc/platform.h.in diff --git a/lib/isc/include/isc/portset.h b/libntp/lib/isc/include/isc/portset.h similarity index 100% rename from lib/isc/include/isc/portset.h rename to libntp/lib/isc/include/isc/portset.h diff --git a/lib/isc/include/isc/print.h b/libntp/lib/isc/include/isc/print.h similarity index 100% rename from lib/isc/include/isc/print.h rename to libntp/lib/isc/include/isc/print.h diff --git a/lib/isc/include/isc/queue.h b/libntp/lib/isc/include/isc/queue.h similarity index 100% rename from lib/isc/include/isc/queue.h rename to libntp/lib/isc/include/isc/queue.h diff --git a/lib/isc/include/isc/quota.h b/libntp/lib/isc/include/isc/quota.h similarity index 100% rename from lib/isc/include/isc/quota.h rename to libntp/lib/isc/include/isc/quota.h diff --git a/lib/isc/include/isc/radix.h b/libntp/lib/isc/include/isc/radix.h similarity index 100% rename from lib/isc/include/isc/radix.h rename to libntp/lib/isc/include/isc/radix.h diff --git a/lib/isc/include/isc/random.h b/libntp/lib/isc/include/isc/random.h similarity index 100% rename from lib/isc/include/isc/random.h rename to libntp/lib/isc/include/isc/random.h diff --git a/lib/isc/include/isc/ratelimiter.h b/libntp/lib/isc/include/isc/ratelimiter.h similarity index 100% rename from lib/isc/include/isc/ratelimiter.h rename to libntp/lib/isc/include/isc/ratelimiter.h diff --git a/lib/isc/include/isc/refcount.h b/libntp/lib/isc/include/isc/refcount.h similarity index 100% rename from lib/isc/include/isc/refcount.h rename to libntp/lib/isc/include/isc/refcount.h diff --git a/lib/isc/include/isc/region.h b/libntp/lib/isc/include/isc/region.h similarity index 100% rename from lib/isc/include/isc/region.h rename to libntp/lib/isc/include/isc/region.h diff --git a/lib/isc/include/isc/resource.h b/libntp/lib/isc/include/isc/resource.h similarity index 100% rename from lib/isc/include/isc/resource.h rename to libntp/lib/isc/include/isc/resource.h diff --git a/lib/isc/include/isc/result.h b/libntp/lib/isc/include/isc/result.h similarity index 100% rename from lib/isc/include/isc/result.h rename to libntp/lib/isc/include/isc/result.h diff --git a/lib/isc/include/isc/resultclass.h b/libntp/lib/isc/include/isc/resultclass.h similarity index 100% rename from lib/isc/include/isc/resultclass.h rename to libntp/lib/isc/include/isc/resultclass.h diff --git a/lib/isc/include/isc/rwlock.h b/libntp/lib/isc/include/isc/rwlock.h similarity index 100% rename from lib/isc/include/isc/rwlock.h rename to libntp/lib/isc/include/isc/rwlock.h diff --git a/lib/isc/include/isc/serial.h b/libntp/lib/isc/include/isc/serial.h similarity index 100% rename from lib/isc/include/isc/serial.h rename to libntp/lib/isc/include/isc/serial.h diff --git a/lib/isc/include/isc/sha1.h b/libntp/lib/isc/include/isc/sha1.h similarity index 100% rename from lib/isc/include/isc/sha1.h rename to libntp/lib/isc/include/isc/sha1.h diff --git a/lib/isc/include/isc/sha2.h b/libntp/lib/isc/include/isc/sha2.h similarity index 100% rename from lib/isc/include/isc/sha2.h rename to libntp/lib/isc/include/isc/sha2.h diff --git a/lib/isc/include/isc/sockaddr.h b/libntp/lib/isc/include/isc/sockaddr.h similarity index 100% rename from lib/isc/include/isc/sockaddr.h rename to libntp/lib/isc/include/isc/sockaddr.h diff --git a/lib/isc/include/isc/socket.h b/libntp/lib/isc/include/isc/socket.h similarity index 100% rename from lib/isc/include/isc/socket.h rename to libntp/lib/isc/include/isc/socket.h diff --git a/lib/isc/include/isc/stats.h b/libntp/lib/isc/include/isc/stats.h similarity index 100% rename from lib/isc/include/isc/stats.h rename to libntp/lib/isc/include/isc/stats.h diff --git a/lib/isc/include/isc/stdio.h b/libntp/lib/isc/include/isc/stdio.h similarity index 100% rename from lib/isc/include/isc/stdio.h rename to libntp/lib/isc/include/isc/stdio.h diff --git a/lib/isc/include/isc/stdlib.h b/libntp/lib/isc/include/isc/stdlib.h similarity index 100% rename from lib/isc/include/isc/stdlib.h rename to libntp/lib/isc/include/isc/stdlib.h diff --git a/lib/isc/include/isc/string.h b/libntp/lib/isc/include/isc/string.h similarity index 100% rename from lib/isc/include/isc/string.h rename to libntp/lib/isc/include/isc/string.h diff --git a/lib/isc/include/isc/symtab.h b/libntp/lib/isc/include/isc/symtab.h similarity index 100% rename from lib/isc/include/isc/symtab.h rename to libntp/lib/isc/include/isc/symtab.h diff --git a/lib/isc/include/isc/task.h b/libntp/lib/isc/include/isc/task.h similarity index 100% rename from lib/isc/include/isc/task.h rename to libntp/lib/isc/include/isc/task.h diff --git a/lib/isc/include/isc/taskpool.h b/libntp/lib/isc/include/isc/taskpool.h similarity index 100% rename from lib/isc/include/isc/taskpool.h rename to libntp/lib/isc/include/isc/taskpool.h diff --git a/lib/isc/include/isc/timer.h b/libntp/lib/isc/include/isc/timer.h similarity index 100% rename from lib/isc/include/isc/timer.h rename to libntp/lib/isc/include/isc/timer.h diff --git a/lib/isc/include/isc/types.h b/libntp/lib/isc/include/isc/types.h similarity index 100% rename from lib/isc/include/isc/types.h rename to libntp/lib/isc/include/isc/types.h diff --git a/lib/isc/include/isc/util.h b/libntp/lib/isc/include/isc/util.h similarity index 100% rename from lib/isc/include/isc/util.h rename to libntp/lib/isc/include/isc/util.h diff --git a/lib/isc/include/isc/version.h b/libntp/lib/isc/include/isc/version.h similarity index 100% rename from lib/isc/include/isc/version.h rename to libntp/lib/isc/include/isc/version.h diff --git a/lib/isc/include/isc/xml.h b/libntp/lib/isc/include/isc/xml.h similarity index 100% rename from lib/isc/include/isc/xml.h rename to libntp/lib/isc/include/isc/xml.h diff --git a/lib/isc/inet_aton.c b/libntp/lib/isc/inet_aton.c similarity index 100% rename from lib/isc/inet_aton.c rename to libntp/lib/isc/inet_aton.c diff --git a/lib/isc/inet_ntop.c b/libntp/lib/isc/inet_ntop.c similarity index 100% rename from lib/isc/inet_ntop.c rename to libntp/lib/isc/inet_ntop.c diff --git a/lib/isc/inet_pton.c b/libntp/lib/isc/inet_pton.c similarity index 100% rename from lib/isc/inet_pton.c rename to libntp/lib/isc/inet_pton.c diff --git a/lib/isc/iterated_hash.c b/libntp/lib/isc/iterated_hash.c similarity index 100% rename from lib/isc/iterated_hash.c rename to libntp/lib/isc/iterated_hash.c diff --git a/lib/isc/lex.c b/libntp/lib/isc/lex.c similarity index 100% rename from lib/isc/lex.c rename to libntp/lib/isc/lex.c diff --git a/lib/isc/lfsr.c b/libntp/lib/isc/lfsr.c similarity index 100% rename from lib/isc/lfsr.c rename to libntp/lib/isc/lfsr.c diff --git a/lib/isc/lib.c b/libntp/lib/isc/lib.c similarity index 100% rename from lib/isc/lib.c rename to libntp/lib/isc/lib.c diff --git a/lib/isc/log.c b/libntp/lib/isc/log.c similarity index 100% rename from lib/isc/log.c rename to libntp/lib/isc/log.c diff --git a/lib/isc/md5.c b/libntp/lib/isc/md5.c similarity index 100% rename from lib/isc/md5.c rename to libntp/lib/isc/md5.c diff --git a/lib/isc/mem.c b/libntp/lib/isc/mem.c similarity index 100% rename from lib/isc/mem.c rename to libntp/lib/isc/mem.c diff --git a/lib/isc/mem_api.c b/libntp/lib/isc/mem_api.c similarity index 100% rename from lib/isc/mem_api.c rename to libntp/lib/isc/mem_api.c diff --git a/lib/isc/mips/include/isc/atomic.h b/libntp/lib/isc/mips/include/isc/atomic.h similarity index 100% rename from lib/isc/mips/include/isc/atomic.h rename to libntp/lib/isc/mips/include/isc/atomic.h diff --git a/lib/isc/mutexblock.c b/libntp/lib/isc/mutexblock.c similarity index 100% rename from lib/isc/mutexblock.c rename to libntp/lib/isc/mutexblock.c diff --git a/lib/isc/netaddr.c b/libntp/lib/isc/netaddr.c similarity index 100% rename from lib/isc/netaddr.c rename to libntp/lib/isc/netaddr.c diff --git a/lib/isc/netscope.c b/libntp/lib/isc/netscope.c similarity index 100% rename from lib/isc/netscope.c rename to libntp/lib/isc/netscope.c diff --git a/lib/isc/nls/msgcat.c b/libntp/lib/isc/nls/msgcat.c similarity index 100% rename from lib/isc/nls/msgcat.c rename to libntp/lib/isc/nls/msgcat.c diff --git a/lib/isc/noatomic/include/isc/atomic.h b/libntp/lib/isc/noatomic/include/isc/atomic.h similarity index 100% rename from lib/isc/noatomic/include/isc/atomic.h rename to libntp/lib/isc/noatomic/include/isc/atomic.h diff --git a/lib/isc/nothreads/condition.c b/libntp/lib/isc/nothreads/condition.c similarity index 100% rename from lib/isc/nothreads/condition.c rename to libntp/lib/isc/nothreads/condition.c diff --git a/lib/isc/nothreads/include/isc/condition.h b/libntp/lib/isc/nothreads/include/isc/condition.h similarity index 100% rename from lib/isc/nothreads/include/isc/condition.h rename to libntp/lib/isc/nothreads/include/isc/condition.h diff --git a/lib/isc/nothreads/include/isc/mutex.h b/libntp/lib/isc/nothreads/include/isc/mutex.h similarity index 100% rename from lib/isc/nothreads/include/isc/mutex.h rename to libntp/lib/isc/nothreads/include/isc/mutex.h diff --git a/lib/isc/nothreads/include/isc/once.h b/libntp/lib/isc/nothreads/include/isc/once.h similarity index 100% rename from lib/isc/nothreads/include/isc/once.h rename to libntp/lib/isc/nothreads/include/isc/once.h diff --git a/lib/isc/nothreads/include/isc/thread.h b/libntp/lib/isc/nothreads/include/isc/thread.h similarity index 100% rename from lib/isc/nothreads/include/isc/thread.h rename to libntp/lib/isc/nothreads/include/isc/thread.h diff --git a/lib/isc/nothreads/mutex.c b/libntp/lib/isc/nothreads/mutex.c similarity index 100% rename from lib/isc/nothreads/mutex.c rename to libntp/lib/isc/nothreads/mutex.c diff --git a/lib/isc/nothreads/thread.c b/libntp/lib/isc/nothreads/thread.c similarity index 100% rename from lib/isc/nothreads/thread.c rename to libntp/lib/isc/nothreads/thread.c diff --git a/lib/isc/ondestroy.c b/libntp/lib/isc/ondestroy.c similarity index 100% rename from lib/isc/ondestroy.c rename to libntp/lib/isc/ondestroy.c diff --git a/lib/isc/parseint.c b/libntp/lib/isc/parseint.c similarity index 100% rename from lib/isc/parseint.c rename to libntp/lib/isc/parseint.c diff --git a/lib/isc/portset.c b/libntp/lib/isc/portset.c similarity index 100% rename from lib/isc/portset.c rename to libntp/lib/isc/portset.c diff --git a/lib/isc/powerpc/include/isc/atomic.h b/libntp/lib/isc/powerpc/include/isc/atomic.h similarity index 100% rename from lib/isc/powerpc/include/isc/atomic.h rename to libntp/lib/isc/powerpc/include/isc/atomic.h diff --git a/lib/isc/print.c b/libntp/lib/isc/print.c similarity index 100% rename from lib/isc/print.c rename to libntp/lib/isc/print.c diff --git a/lib/isc/pthreads/condition.c b/libntp/lib/isc/pthreads/condition.c similarity index 100% rename from lib/isc/pthreads/condition.c rename to libntp/lib/isc/pthreads/condition.c diff --git a/lib/isc/pthreads/include/isc/condition.h b/libntp/lib/isc/pthreads/include/isc/condition.h similarity index 100% rename from lib/isc/pthreads/include/isc/condition.h rename to libntp/lib/isc/pthreads/include/isc/condition.h diff --git a/lib/isc/pthreads/include/isc/mutex.h b/libntp/lib/isc/pthreads/include/isc/mutex.h similarity index 100% rename from lib/isc/pthreads/include/isc/mutex.h rename to libntp/lib/isc/pthreads/include/isc/mutex.h diff --git a/lib/isc/pthreads/include/isc/once.h b/libntp/lib/isc/pthreads/include/isc/once.h similarity index 100% rename from lib/isc/pthreads/include/isc/once.h rename to libntp/lib/isc/pthreads/include/isc/once.h diff --git a/lib/isc/pthreads/include/isc/thread.h b/libntp/lib/isc/pthreads/include/isc/thread.h similarity index 100% rename from lib/isc/pthreads/include/isc/thread.h rename to libntp/lib/isc/pthreads/include/isc/thread.h diff --git a/lib/isc/pthreads/mutex.c b/libntp/lib/isc/pthreads/mutex.c similarity index 100% rename from lib/isc/pthreads/mutex.c rename to libntp/lib/isc/pthreads/mutex.c diff --git a/lib/isc/pthreads/thread.c b/libntp/lib/isc/pthreads/thread.c similarity index 100% rename from lib/isc/pthreads/thread.c rename to libntp/lib/isc/pthreads/thread.c diff --git a/lib/isc/quota.c b/libntp/lib/isc/quota.c similarity index 100% rename from lib/isc/quota.c rename to libntp/lib/isc/quota.c diff --git a/lib/isc/radix.c b/libntp/lib/isc/radix.c similarity index 100% rename from lib/isc/radix.c rename to libntp/lib/isc/radix.c diff --git a/lib/isc/random.c b/libntp/lib/isc/random.c similarity index 100% rename from lib/isc/random.c rename to libntp/lib/isc/random.c diff --git a/lib/isc/ratelimiter.c b/libntp/lib/isc/ratelimiter.c similarity index 100% rename from lib/isc/ratelimiter.c rename to libntp/lib/isc/ratelimiter.c diff --git a/lib/isc/refcount.c b/libntp/lib/isc/refcount.c similarity index 100% rename from lib/isc/refcount.c rename to libntp/lib/isc/refcount.c diff --git a/lib/isc/region.c b/libntp/lib/isc/region.c similarity index 100% rename from lib/isc/region.c rename to libntp/lib/isc/region.c diff --git a/lib/isc/result.c b/libntp/lib/isc/result.c similarity index 100% rename from lib/isc/result.c rename to libntp/lib/isc/result.c diff --git a/lib/isc/rwlock.c b/libntp/lib/isc/rwlock.c similarity index 100% rename from lib/isc/rwlock.c rename to libntp/lib/isc/rwlock.c diff --git a/lib/isc/serial.c b/libntp/lib/isc/serial.c similarity index 100% rename from lib/isc/serial.c rename to libntp/lib/isc/serial.c diff --git a/lib/isc/sha1.c b/libntp/lib/isc/sha1.c similarity index 100% rename from lib/isc/sha1.c rename to libntp/lib/isc/sha1.c diff --git a/lib/isc/sha2.c b/libntp/lib/isc/sha2.c similarity index 100% rename from lib/isc/sha2.c rename to libntp/lib/isc/sha2.c diff --git a/lib/isc/sockaddr.c b/libntp/lib/isc/sockaddr.c similarity index 100% rename from lib/isc/sockaddr.c rename to libntp/lib/isc/sockaddr.c diff --git a/lib/isc/socket_api.c b/libntp/lib/isc/socket_api.c similarity index 100% rename from lib/isc/socket_api.c rename to libntp/lib/isc/socket_api.c diff --git a/lib/isc/sparc64/include/isc/atomic.h b/libntp/lib/isc/sparc64/include/isc/atomic.h similarity index 100% rename from lib/isc/sparc64/include/isc/atomic.h rename to libntp/lib/isc/sparc64/include/isc/atomic.h diff --git a/lib/isc/stats.c b/libntp/lib/isc/stats.c similarity index 100% rename from lib/isc/stats.c rename to libntp/lib/isc/stats.c diff --git a/lib/isc/string.c b/libntp/lib/isc/string.c similarity index 100% rename from lib/isc/string.c rename to libntp/lib/isc/string.c diff --git a/lib/isc/strtoul.c b/libntp/lib/isc/strtoul.c similarity index 100% rename from lib/isc/strtoul.c rename to libntp/lib/isc/strtoul.c diff --git a/lib/isc/symtab.c b/libntp/lib/isc/symtab.c similarity index 100% rename from lib/isc/symtab.c rename to libntp/lib/isc/symtab.c diff --git a/lib/isc/task.c b/libntp/lib/isc/task.c similarity index 100% rename from lib/isc/task.c rename to libntp/lib/isc/task.c diff --git a/lib/isc/task_api.c b/libntp/lib/isc/task_api.c similarity index 100% rename from lib/isc/task_api.c rename to libntp/lib/isc/task_api.c diff --git a/lib/isc/task_p.h b/libntp/lib/isc/task_p.h similarity index 100% rename from lib/isc/task_p.h rename to libntp/lib/isc/task_p.h diff --git a/lib/isc/taskpool.c b/libntp/lib/isc/taskpool.c similarity index 100% rename from lib/isc/taskpool.c rename to libntp/lib/isc/taskpool.c diff --git a/lib/isc/tests/Atffile b/libntp/lib/isc/tests/Atffile similarity index 100% rename from lib/isc/tests/Atffile rename to libntp/lib/isc/tests/Atffile diff --git a/lib/isc/tests/hash_test.c b/libntp/lib/isc/tests/hash_test.c similarity index 100% rename from lib/isc/tests/hash_test.c rename to libntp/lib/isc/tests/hash_test.c diff --git a/lib/isc/tests/isctest.c b/libntp/lib/isc/tests/isctest.c similarity index 100% rename from lib/isc/tests/isctest.c rename to libntp/lib/isc/tests/isctest.c diff --git a/lib/isc/tests/isctest.h b/libntp/lib/isc/tests/isctest.h similarity index 100% rename from lib/isc/tests/isctest.h rename to libntp/lib/isc/tests/isctest.h diff --git a/lib/isc/tests/queue_test.c b/libntp/lib/isc/tests/queue_test.c similarity index 100% rename from lib/isc/tests/queue_test.c rename to libntp/lib/isc/tests/queue_test.c diff --git a/lib/isc/tests/socket_test.c b/libntp/lib/isc/tests/socket_test.c similarity index 100% rename from lib/isc/tests/socket_test.c rename to libntp/lib/isc/tests/socket_test.c diff --git a/lib/isc/tests/symtab_test.c b/libntp/lib/isc/tests/symtab_test.c similarity index 100% rename from lib/isc/tests/symtab_test.c rename to libntp/lib/isc/tests/symtab_test.c diff --git a/lib/isc/tests/task_test.c b/libntp/lib/isc/tests/task_test.c similarity index 100% rename from lib/isc/tests/task_test.c rename to libntp/lib/isc/tests/task_test.c diff --git a/lib/isc/tests/taskpool_test.c b/libntp/lib/isc/tests/taskpool_test.c similarity index 100% rename from lib/isc/tests/taskpool_test.c rename to libntp/lib/isc/tests/taskpool_test.c diff --git a/lib/isc/timer.c b/libntp/lib/isc/timer.c similarity index 100% rename from lib/isc/timer.c rename to libntp/lib/isc/timer.c diff --git a/lib/isc/timer_api.c b/libntp/lib/isc/timer_api.c similarity index 100% rename from lib/isc/timer_api.c rename to libntp/lib/isc/timer_api.c diff --git a/lib/isc/timer_p.h b/libntp/lib/isc/timer_p.h similarity index 100% rename from lib/isc/timer_p.h rename to libntp/lib/isc/timer_p.h diff --git a/lib/isc/tsmemcmp.c b/libntp/lib/isc/tsmemcmp.c similarity index 100% rename from lib/isc/tsmemcmp.c rename to libntp/lib/isc/tsmemcmp.c diff --git a/lib/isc/unix/app.c b/libntp/lib/isc/unix/app.c similarity index 100% rename from lib/isc/unix/app.c rename to libntp/lib/isc/unix/app.c diff --git a/lib/isc/unix/dir.c b/libntp/lib/isc/unix/dir.c similarity index 100% rename from lib/isc/unix/dir.c rename to libntp/lib/isc/unix/dir.c diff --git a/lib/isc/unix/entropy.c b/libntp/lib/isc/unix/entropy.c similarity index 100% rename from lib/isc/unix/entropy.c rename to libntp/lib/isc/unix/entropy.c diff --git a/lib/isc/unix/errno2result.c b/libntp/lib/isc/unix/errno2result.c similarity index 100% rename from lib/isc/unix/errno2result.c rename to libntp/lib/isc/unix/errno2result.c diff --git a/lib/isc/unix/errno2result.h b/libntp/lib/isc/unix/errno2result.h similarity index 100% rename from lib/isc/unix/errno2result.h rename to libntp/lib/isc/unix/errno2result.h diff --git a/lib/isc/unix/file.c b/libntp/lib/isc/unix/file.c similarity index 100% rename from lib/isc/unix/file.c rename to libntp/lib/isc/unix/file.c diff --git a/lib/isc/unix/fsaccess.c b/libntp/lib/isc/unix/fsaccess.c similarity index 100% rename from lib/isc/unix/fsaccess.c rename to libntp/lib/isc/unix/fsaccess.c diff --git a/lib/isc/unix/ifiter_getifaddrs.c b/libntp/lib/isc/unix/ifiter_getifaddrs.c similarity index 100% rename from lib/isc/unix/ifiter_getifaddrs.c rename to libntp/lib/isc/unix/ifiter_getifaddrs.c diff --git a/lib/isc/unix/ifiter_ioctl.c b/libntp/lib/isc/unix/ifiter_ioctl.c similarity index 100% rename from lib/isc/unix/ifiter_ioctl.c rename to libntp/lib/isc/unix/ifiter_ioctl.c diff --git a/lib/isc/unix/ifiter_sysctl.c b/libntp/lib/isc/unix/ifiter_sysctl.c similarity index 100% rename from lib/isc/unix/ifiter_sysctl.c rename to libntp/lib/isc/unix/ifiter_sysctl.c diff --git a/lib/isc/unix/include/isc/dir.h b/libntp/lib/isc/unix/include/isc/dir.h similarity index 100% rename from lib/isc/unix/include/isc/dir.h rename to libntp/lib/isc/unix/include/isc/dir.h diff --git a/lib/isc/unix/include/isc/int.h b/libntp/lib/isc/unix/include/isc/int.h similarity index 100% rename from lib/isc/unix/include/isc/int.h rename to libntp/lib/isc/unix/include/isc/int.h diff --git a/lib/isc/unix/include/isc/keyboard.h b/libntp/lib/isc/unix/include/isc/keyboard.h similarity index 100% rename from lib/isc/unix/include/isc/keyboard.h rename to libntp/lib/isc/unix/include/isc/keyboard.h diff --git a/lib/isc/unix/include/isc/net.h b/libntp/lib/isc/unix/include/isc/net.h similarity index 100% rename from lib/isc/unix/include/isc/net.h rename to libntp/lib/isc/unix/include/isc/net.h diff --git a/lib/isc/unix/include/isc/netdb.h b/libntp/lib/isc/unix/include/isc/netdb.h similarity index 100% rename from lib/isc/unix/include/isc/netdb.h rename to libntp/lib/isc/unix/include/isc/netdb.h diff --git a/lib/isc/unix/include/isc/offset.h b/libntp/lib/isc/unix/include/isc/offset.h similarity index 100% rename from lib/isc/unix/include/isc/offset.h rename to libntp/lib/isc/unix/include/isc/offset.h diff --git a/lib/isc/unix/include/isc/stat.h b/libntp/lib/isc/unix/include/isc/stat.h similarity index 100% rename from lib/isc/unix/include/isc/stat.h rename to libntp/lib/isc/unix/include/isc/stat.h diff --git a/lib/isc/unix/include/isc/stdtime.h b/libntp/lib/isc/unix/include/isc/stdtime.h similarity index 100% rename from lib/isc/unix/include/isc/stdtime.h rename to libntp/lib/isc/unix/include/isc/stdtime.h diff --git a/lib/isc/unix/include/isc/strerror.h b/libntp/lib/isc/unix/include/isc/strerror.h similarity index 100% rename from lib/isc/unix/include/isc/strerror.h rename to libntp/lib/isc/unix/include/isc/strerror.h diff --git a/lib/isc/unix/include/isc/syslog.h b/libntp/lib/isc/unix/include/isc/syslog.h similarity index 100% rename from lib/isc/unix/include/isc/syslog.h rename to libntp/lib/isc/unix/include/isc/syslog.h diff --git a/lib/isc/unix/include/isc/time.h b/libntp/lib/isc/unix/include/isc/time.h similarity index 100% rename from lib/isc/unix/include/isc/time.h rename to libntp/lib/isc/unix/include/isc/time.h diff --git a/lib/isc/unix/interfaceiter.c b/libntp/lib/isc/unix/interfaceiter.c similarity index 100% rename from lib/isc/unix/interfaceiter.c rename to libntp/lib/isc/unix/interfaceiter.c diff --git a/lib/isc/unix/ipv6.c b/libntp/lib/isc/unix/ipv6.c similarity index 100% rename from lib/isc/unix/ipv6.c rename to libntp/lib/isc/unix/ipv6.c diff --git a/lib/isc/unix/keyboard.c b/libntp/lib/isc/unix/keyboard.c similarity index 100% rename from lib/isc/unix/keyboard.c rename to libntp/lib/isc/unix/keyboard.c diff --git a/lib/isc/unix/net.c b/libntp/lib/isc/unix/net.c similarity index 100% rename from lib/isc/unix/net.c rename to libntp/lib/isc/unix/net.c diff --git a/lib/isc/unix/os.c b/libntp/lib/isc/unix/os.c similarity index 100% rename from lib/isc/unix/os.c rename to libntp/lib/isc/unix/os.c diff --git a/lib/isc/unix/resource.c b/libntp/lib/isc/unix/resource.c similarity index 100% rename from lib/isc/unix/resource.c rename to libntp/lib/isc/unix/resource.c diff --git a/lib/isc/unix/socket.c b/libntp/lib/isc/unix/socket.c similarity index 100% rename from lib/isc/unix/socket.c rename to libntp/lib/isc/unix/socket.c diff --git a/lib/isc/unix/socket_p.h b/libntp/lib/isc/unix/socket_p.h similarity index 100% rename from lib/isc/unix/socket_p.h rename to libntp/lib/isc/unix/socket_p.h diff --git a/lib/isc/unix/stdio.c b/libntp/lib/isc/unix/stdio.c similarity index 100% rename from lib/isc/unix/stdio.c rename to libntp/lib/isc/unix/stdio.c diff --git a/lib/isc/unix/stdtime.c b/libntp/lib/isc/unix/stdtime.c similarity index 100% rename from lib/isc/unix/stdtime.c rename to libntp/lib/isc/unix/stdtime.c diff --git a/lib/isc/unix/strerror.c b/libntp/lib/isc/unix/strerror.c similarity index 100% rename from lib/isc/unix/strerror.c rename to libntp/lib/isc/unix/strerror.c diff --git a/lib/isc/unix/syslog.c b/libntp/lib/isc/unix/syslog.c similarity index 100% rename from lib/isc/unix/syslog.c rename to libntp/lib/isc/unix/syslog.c diff --git a/lib/isc/unix/time.c b/libntp/lib/isc/unix/time.c similarity index 100% rename from lib/isc/unix/time.c rename to libntp/lib/isc/unix/time.c diff --git a/lib/isc/version.c b/libntp/lib/isc/version.c similarity index 100% rename from lib/isc/version.c rename to libntp/lib/isc/version.c diff --git a/lib/isc/win32/DLLMain.c b/libntp/lib/isc/win32/DLLMain.c similarity index 100% rename from lib/isc/win32/DLLMain.c rename to libntp/lib/isc/win32/DLLMain.c diff --git a/lib/isc/win32/app.c b/libntp/lib/isc/win32/app.c similarity index 100% rename from lib/isc/win32/app.c rename to libntp/lib/isc/win32/app.c diff --git a/lib/isc/win32/condition.c b/libntp/lib/isc/win32/condition.c similarity index 100% rename from lib/isc/win32/condition.c rename to libntp/lib/isc/win32/condition.c diff --git a/lib/isc/win32/dir.c b/libntp/lib/isc/win32/dir.c similarity index 100% rename from lib/isc/win32/dir.c rename to libntp/lib/isc/win32/dir.c diff --git a/lib/isc/win32/entropy.c b/libntp/lib/isc/win32/entropy.c similarity index 100% rename from lib/isc/win32/entropy.c rename to libntp/lib/isc/win32/entropy.c diff --git a/lib/isc/win32/errno2result.c b/libntp/lib/isc/win32/errno2result.c similarity index 100% rename from lib/isc/win32/errno2result.c rename to libntp/lib/isc/win32/errno2result.c diff --git a/lib/isc/win32/errno2result.h b/libntp/lib/isc/win32/errno2result.h similarity index 100% rename from lib/isc/win32/errno2result.h rename to libntp/lib/isc/win32/errno2result.h diff --git a/lib/isc/win32/file.c b/libntp/lib/isc/win32/file.c similarity index 100% rename from lib/isc/win32/file.c rename to libntp/lib/isc/win32/file.c diff --git a/lib/isc/win32/fsaccess.c b/libntp/lib/isc/win32/fsaccess.c similarity index 100% rename from lib/isc/win32/fsaccess.c rename to libntp/lib/isc/win32/fsaccess.c diff --git a/lib/isc/win32/include/isc/bind_registry.h b/libntp/lib/isc/win32/include/isc/bind_registry.h similarity index 100% rename from lib/isc/win32/include/isc/bind_registry.h rename to libntp/lib/isc/win32/include/isc/bind_registry.h diff --git a/lib/isc/win32/include/isc/bindevt.h b/libntp/lib/isc/win32/include/isc/bindevt.h similarity index 100% rename from lib/isc/win32/include/isc/bindevt.h rename to libntp/lib/isc/win32/include/isc/bindevt.h diff --git a/lib/isc/win32/include/isc/condition.h b/libntp/lib/isc/win32/include/isc/condition.h similarity index 100% rename from lib/isc/win32/include/isc/condition.h rename to libntp/lib/isc/win32/include/isc/condition.h diff --git a/lib/isc/win32/include/isc/dir.h b/libntp/lib/isc/win32/include/isc/dir.h similarity index 100% rename from lib/isc/win32/include/isc/dir.h rename to libntp/lib/isc/win32/include/isc/dir.h diff --git a/lib/isc/win32/include/isc/int.h b/libntp/lib/isc/win32/include/isc/int.h similarity index 100% rename from lib/isc/win32/include/isc/int.h rename to libntp/lib/isc/win32/include/isc/int.h diff --git a/lib/isc/win32/include/isc/ipv6.h b/libntp/lib/isc/win32/include/isc/ipv6.h similarity index 100% rename from lib/isc/win32/include/isc/ipv6.h rename to libntp/lib/isc/win32/include/isc/ipv6.h diff --git a/lib/isc/win32/include/isc/keyboard.h b/libntp/lib/isc/win32/include/isc/keyboard.h similarity index 100% rename from lib/isc/win32/include/isc/keyboard.h rename to libntp/lib/isc/win32/include/isc/keyboard.h diff --git a/lib/isc/win32/include/isc/mutex.h b/libntp/lib/isc/win32/include/isc/mutex.h similarity index 100% rename from lib/isc/win32/include/isc/mutex.h rename to libntp/lib/isc/win32/include/isc/mutex.h diff --git a/lib/isc/win32/include/isc/net.h b/libntp/lib/isc/win32/include/isc/net.h similarity index 100% rename from lib/isc/win32/include/isc/net.h rename to libntp/lib/isc/win32/include/isc/net.h diff --git a/lib/isc/win32/include/isc/netdb.h b/libntp/lib/isc/win32/include/isc/netdb.h similarity index 100% rename from lib/isc/win32/include/isc/netdb.h rename to libntp/lib/isc/win32/include/isc/netdb.h diff --git a/lib/isc/win32/include/isc/ntgroups.h b/libntp/lib/isc/win32/include/isc/ntgroups.h similarity index 100% rename from lib/isc/win32/include/isc/ntgroups.h rename to libntp/lib/isc/win32/include/isc/ntgroups.h diff --git a/lib/isc/win32/include/isc/ntpaths.h b/libntp/lib/isc/win32/include/isc/ntpaths.h similarity index 100% rename from lib/isc/win32/include/isc/ntpaths.h rename to libntp/lib/isc/win32/include/isc/ntpaths.h diff --git a/lib/isc/win32/include/isc/offset.h b/libntp/lib/isc/win32/include/isc/offset.h similarity index 100% rename from lib/isc/win32/include/isc/offset.h rename to libntp/lib/isc/win32/include/isc/offset.h diff --git a/lib/isc/win32/include/isc/once.h b/libntp/lib/isc/win32/include/isc/once.h similarity index 100% rename from lib/isc/win32/include/isc/once.h rename to libntp/lib/isc/win32/include/isc/once.h diff --git a/lib/isc/win32/include/isc/platform.h b/libntp/lib/isc/win32/include/isc/platform.h similarity index 100% rename from lib/isc/win32/include/isc/platform.h rename to libntp/lib/isc/win32/include/isc/platform.h diff --git a/lib/isc/win32/include/isc/stat.h b/libntp/lib/isc/win32/include/isc/stat.h similarity index 100% rename from lib/isc/win32/include/isc/stat.h rename to libntp/lib/isc/win32/include/isc/stat.h diff --git a/lib/isc/win32/include/isc/stdtime.h b/libntp/lib/isc/win32/include/isc/stdtime.h similarity index 100% rename from lib/isc/win32/include/isc/stdtime.h rename to libntp/lib/isc/win32/include/isc/stdtime.h diff --git a/lib/isc/win32/include/isc/strerror.h b/libntp/lib/isc/win32/include/isc/strerror.h similarity index 100% rename from lib/isc/win32/include/isc/strerror.h rename to libntp/lib/isc/win32/include/isc/strerror.h diff --git a/lib/isc/win32/include/isc/syslog.h b/libntp/lib/isc/win32/include/isc/syslog.h similarity index 100% rename from lib/isc/win32/include/isc/syslog.h rename to libntp/lib/isc/win32/include/isc/syslog.h diff --git a/lib/isc/win32/include/isc/thread.h b/libntp/lib/isc/win32/include/isc/thread.h similarity index 100% rename from lib/isc/win32/include/isc/thread.h rename to libntp/lib/isc/win32/include/isc/thread.h diff --git a/lib/isc/win32/include/isc/time.h b/libntp/lib/isc/win32/include/isc/time.h similarity index 100% rename from lib/isc/win32/include/isc/time.h rename to libntp/lib/isc/win32/include/isc/time.h diff --git a/lib/isc/win32/include/isc/win32os.h b/libntp/lib/isc/win32/include/isc/win32os.h similarity index 100% rename from lib/isc/win32/include/isc/win32os.h rename to libntp/lib/isc/win32/include/isc/win32os.h diff --git a/lib/isc/win32/interfaceiter.c b/libntp/lib/isc/win32/interfaceiter.c similarity index 100% rename from lib/isc/win32/interfaceiter.c rename to libntp/lib/isc/win32/interfaceiter.c diff --git a/lib/isc/win32/ipv6.c b/libntp/lib/isc/win32/ipv6.c similarity index 100% rename from lib/isc/win32/ipv6.c rename to libntp/lib/isc/win32/ipv6.c diff --git a/lib/isc/win32/keyboard.c b/libntp/lib/isc/win32/keyboard.c similarity index 100% rename from lib/isc/win32/keyboard.c rename to libntp/lib/isc/win32/keyboard.c diff --git a/lib/isc/win32/libgen.h b/libntp/lib/isc/win32/libgen.h similarity index 100% rename from lib/isc/win32/libgen.h rename to libntp/lib/isc/win32/libgen.h diff --git a/lib/isc/win32/libisc.def b/libntp/lib/isc/win32/libisc.def similarity index 100% rename from lib/isc/win32/libisc.def rename to libntp/lib/isc/win32/libisc.def diff --git a/lib/isc/win32/libisc.dsp b/libntp/lib/isc/win32/libisc.dsp similarity index 100% rename from lib/isc/win32/libisc.dsp rename to libntp/lib/isc/win32/libisc.dsp diff --git a/lib/isc/win32/libisc.dsw b/libntp/lib/isc/win32/libisc.dsw similarity index 100% rename from lib/isc/win32/libisc.dsw rename to libntp/lib/isc/win32/libisc.dsw diff --git a/lib/isc/win32/libisc.mak b/libntp/lib/isc/win32/libisc.mak similarity index 100% rename from lib/isc/win32/libisc.mak rename to libntp/lib/isc/win32/libisc.mak diff --git a/lib/isc/win32/net.c b/libntp/lib/isc/win32/net.c similarity index 100% rename from lib/isc/win32/net.c rename to libntp/lib/isc/win32/net.c diff --git a/lib/isc/win32/netdb.h b/libntp/lib/isc/win32/netdb.h similarity index 100% rename from lib/isc/win32/netdb.h rename to libntp/lib/isc/win32/netdb.h diff --git a/lib/isc/win32/ntgroups.c b/libntp/lib/isc/win32/ntgroups.c similarity index 100% rename from lib/isc/win32/ntgroups.c rename to libntp/lib/isc/win32/ntgroups.c diff --git a/lib/isc/win32/ntpaths.c b/libntp/lib/isc/win32/ntpaths.c similarity index 100% rename from lib/isc/win32/ntpaths.c rename to libntp/lib/isc/win32/ntpaths.c diff --git a/lib/isc/win32/once.c b/libntp/lib/isc/win32/once.c similarity index 100% rename from lib/isc/win32/once.c rename to libntp/lib/isc/win32/once.c diff --git a/lib/isc/win32/os.c b/libntp/lib/isc/win32/os.c similarity index 100% rename from lib/isc/win32/os.c rename to libntp/lib/isc/win32/os.c diff --git a/lib/isc/win32/resource.c b/libntp/lib/isc/win32/resource.c similarity index 100% rename from lib/isc/win32/resource.c rename to libntp/lib/isc/win32/resource.c diff --git a/lib/isc/win32/socket.c b/libntp/lib/isc/win32/socket.c similarity index 100% rename from lib/isc/win32/socket.c rename to libntp/lib/isc/win32/socket.c diff --git a/lib/isc/win32/stdio.c b/libntp/lib/isc/win32/stdio.c similarity index 100% rename from lib/isc/win32/stdio.c rename to libntp/lib/isc/win32/stdio.c diff --git a/lib/isc/win32/stdtime.c b/libntp/lib/isc/win32/stdtime.c similarity index 100% rename from lib/isc/win32/stdtime.c rename to libntp/lib/isc/win32/stdtime.c diff --git a/lib/isc/win32/strerror.c b/libntp/lib/isc/win32/strerror.c similarity index 100% rename from lib/isc/win32/strerror.c rename to libntp/lib/isc/win32/strerror.c diff --git a/lib/isc/win32/syslog.c b/libntp/lib/isc/win32/syslog.c similarity index 100% rename from lib/isc/win32/syslog.c rename to libntp/lib/isc/win32/syslog.c diff --git a/lib/isc/win32/syslog.h b/libntp/lib/isc/win32/syslog.h similarity index 100% rename from lib/isc/win32/syslog.h rename to libntp/lib/isc/win32/syslog.h diff --git a/lib/isc/win32/thread.c b/libntp/lib/isc/win32/thread.c similarity index 100% rename from lib/isc/win32/thread.c rename to libntp/lib/isc/win32/thread.c diff --git a/lib/isc/win32/time.c b/libntp/lib/isc/win32/time.c similarity index 100% rename from lib/isc/win32/time.c rename to libntp/lib/isc/win32/time.c diff --git a/lib/isc/win32/unistd.h b/libntp/lib/isc/win32/unistd.h similarity index 100% rename from lib/isc/win32/unistd.h rename to libntp/lib/isc/win32/unistd.h diff --git a/lib/isc/win32/version.c b/libntp/lib/isc/win32/version.c similarity index 100% rename from lib/isc/win32/version.c rename to libntp/lib/isc/win32/version.c diff --git a/lib/isc/win32/win32os.c b/libntp/lib/isc/win32/win32os.c similarity index 100% rename from lib/isc/win32/win32os.c rename to libntp/lib/isc/win32/win32os.c diff --git a/lib/isc/x86_32/include/isc/atomic.h b/libntp/lib/isc/x86_32/include/isc/atomic.h similarity index 100% rename from lib/isc/x86_32/include/isc/atomic.h rename to libntp/lib/isc/x86_32/include/isc/atomic.h diff --git a/lib/isc/x86_64/include/isc/atomic.h b/libntp/lib/isc/x86_64/include/isc/atomic.h similarity index 100% rename from lib/isc/x86_64/include/isc/atomic.h rename to libntp/lib/isc/x86_64/include/isc/atomic.h diff --git a/libntp/ntp_crypto_rnd.c b/libntp/ntp_crypto_rnd.c index b43e3eecd..5fe7382ef 100644 --- a/libntp/ntp_crypto_rnd.c +++ b/libntp/ntp_crypto_rnd.c @@ -14,7 +14,7 @@ #endif #include -#include +#include #include #include "safecast.h" @@ -23,27 +23,8 @@ #include int crypto_rand_init = 0; -#else - -# ifndef HAVE_ARC4RANDOM_BUF -static int arc4random_stir(void); -static void arc4random_buf(void *buf, size_t nbytes); - -int evutil_secure_rng_init(void); -void evutil_secure_rng_get_bytes(void *buf, size_t nbytes); - -static int -arc4random_stir(void) -{ - return(evutil_secure_rng_init()); -} -static void -arc4random_buf(void *buf, size_t nbytes) -{ - evutil_secure_rng_get_bytes(buf, nbytes); - return; -} -# endif +#elif !defined(HAVE_ARC4RANDOM_BUF) +#include #endif int crypto_rand_ok = 0; @@ -51,30 +32,31 @@ int crypto_rand_ok = 0; /* * As of late 2014, here's how we plan to provide cryptographic-quality * random numbers: - * + * * - If we are building with OpenSSL, use RAND_poll() and RAND_bytes(). * - Otherwise, use arc4random(). - * - * Use of arc4random() can be forced using configure --disable-openssl-random + * + * Use of arc4random() can be forced using configure options + * --disable-openssl-random or --without-crypto. * * We can count on arc4random existing, thru the OS or thru libevent. * The quality of arc4random depends on the implementor. - * + * * RAND_poll() doesn't show up until XXX. If it's not present, we * need to either provide our own or use arc4random(). */ -/* - * ntp_crypto_srandom: - * - * Initialize the random number generator, if needed by the underlying - * crypto random number generation mechanism. - */ + /* + * ntp_crypto_srandom: + * + * Initialize the random number generator, if needed by the underlying + * crypto random number generation mechanism. + */ void ntp_crypto_srandom( void - ) +) { #ifdef USE_OPENSSL_CRYPTO_RAND if (!crypto_rand_init) { @@ -82,20 +64,25 @@ ntp_crypto_srandom( crypto_rand_ok = 1; crypto_rand_init = 1; } +#elif HAVE_ARC4RANDOM_BUF + /* + * arc4random_buf has no error return and needs no seeding nor reseeding. + */ + crypto_rand_ok = 1; #else /* - * Explicitly init arc4random to make sure it does seed OK. This - * is the only way we can tell if it can successfully get + * Explicitly init libevent secure RNG to make sure it seeds. + * This is the only way we can tell if it can successfully get * entropy from the system. */ - if (!arc4random_stir()) + if (!evutil_secure_rng_init()) crypto_rand_ok = 1; #endif } /* - * ntp_crypto_random_buf: + * ntp_crypto_random_buf: Used by ntp-keygen * * Returns 0 on success, -1 on error. */ @@ -106,22 +93,23 @@ ntp_crypto_random_buf( ) { if (!crypto_rand_ok) - return (-1); + return -1; -#ifdef USE_OPENSSL_CRYPTO_RAND +#if defined(USE_OPENSSL_CRYPTO_RAND) if (1 != RAND_bytes(buf, size2int_chk(nbytes))) { unsigned long err; char *err_str; err = ERR_get_error(); err_str = ERR_error_string(err, NULL); - /* XXX: Log the error */ - (void)&err_str; + msyslog(LOG_ERR, "RAND_bytes failed: %s", err_str); return -1; } -#else +#elif defined(HAVE_ARC4RANDOM_BUF) arc4random_buf(buf, nbytes); +#else + evutil_secure_rng_get_bytes(buf, nbytes); #endif return 0; } diff --git a/libparse/Makefile.am b/libparse/Makefile.am index 8fb089f77..b5dbbcaae 100644 --- a/libparse/Makefile.am +++ b/libparse/Makefile.am @@ -1,6 +1,7 @@ NULL= BUILT_SOURCES = $(VPHACK) info_trimble.c $(VPHACK_AFTER) CLEANFILES = +DISTCLEANFILES = noinst_LIBRARIES = @MAKE_LIBPARSE@ @MAKE_LIBPARSE_KERNEL@ EXTRA_LIBRARIES = libparse.a libparse_kernel.a EXTRA_PROGRAMS = parsestreams parsesolaris @@ -174,6 +175,6 @@ sys/systm.h: check-libparse: $(noinst_LIBRARIES) @: do-nothing action to avoid default SCCS get -include $(top_srcdir)/sntp/check-libntp.mf +include $(top_srcdir)/check-libntp.mf include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am index 056fc83ed..42ad789c1 100644 --- a/ntpd/Makefile.am +++ b/ntpd/Makefile.am @@ -486,6 +486,6 @@ $(srcdir)/Makefile.am: include $(top_srcdir)/bincheck.mf include $(top_srcdir)/check-libopts.mf -include $(top_srcdir)/sntp/check-libntp.mf +include $(top_srcdir)/check-libntp.mf include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/ntpd/ntp_ppsdev.c b/ntpd/ntp_ppsdev.c index 00bd2388e..d2d9727e3 100644 --- a/ntpd/ntp_ppsdev.c +++ b/ntpd/ntp_ppsdev.c @@ -23,8 +23,11 @@ #endif #include "config.h" + #include "ntpd.h" +#ifdef REFCLOCK + #if defined(HAVE_UNISTD_H) # include #endif @@ -451,3 +454,6 @@ ppsdev_close( close(ppsfd); } /* --*-- that's all folks --*-- */ +#else +NONEMPTY_TRANSLATION_UNIT +#endif /* !defined(REFCLOCK) */ diff --git a/ntpdate/Makefile.am b/ntpdate/Makefile.am index 3abe27a5f..8c08cf6d7 100644 --- a/ntpdate/Makefile.am +++ b/ntpdate/Makefile.am @@ -38,6 +38,6 @@ version.o: version.c env CCACHE_DISABLE=1 $(COMPILE) -c version.c -o version.o include $(top_srcdir)/bincheck.mf -include $(top_srcdir)/sntp/check-libntp.mf +include $(top_srcdir)/check-libntp.mf include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am index 30cfda046..f56138b86 100644 --- a/ntpdc/Makefile.am +++ b/ntpdc/Makefile.am @@ -149,6 +149,6 @@ nl.c: nl_in.c nl.pl Makefile.am ../config.h ../include/ntp_request.h ntpdc.h include $(top_srcdir)/bincheck.mf include $(top_srcdir)/check-libopts.mf -include $(top_srcdir)/sntp/check-libntp.mf +include $(top_srcdir)/check-libntp.mf include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am index fefb31cd4..3d7956b87 100644 --- a/ntpq/Makefile.am +++ b/ntpq/Makefile.am @@ -135,6 +135,6 @@ version.o: version.c include $(top_srcdir)/bincheck.mf include $(top_srcdir)/check-libopts.mf -include $(top_srcdir)/sntp/check-libntp.mf +include $(top_srcdir)/check-libntp.mf include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/ntpsnmpd/Makefile.am b/ntpsnmpd/Makefile.am index e63098cd3..580e7574e 100644 --- a/ntpsnmpd/Makefile.am +++ b/ntpsnmpd/Makefile.am @@ -114,7 +114,7 @@ $(srcdir)/ntpsnmpd.html: $(srcdir)/ntpsnmpd.texi $(top_srcdir)/sntp/include/vers cd $(srcdir) && ( makeinfo --force --html --no-split -o ntpsnmpd.html ntpsnmpd.texi || true ) include $(top_srcdir)/bincheck.mf -include $(top_srcdir)/sntp/check-libntp.mf +include $(top_srcdir)/check-libntp.mf include $(top_srcdir)/check-libopts.mf include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/ports/winnt/vs2005/libntp.vcproj b/ports/winnt/vs2005/libntp.vcproj index f9b589af5..737226862 100644 --- a/ports/winnt/vs2005/libntp.vcproj +++ b/ports/winnt/vs2005/libntp.vcproj @@ -41,7 +41,7 @@ - - diff --git a/ports/winnt/vs2005/ntpd.vcproj b/ports/winnt/vs2005/ntpd.vcproj index f829a6365..4cba492ad 100644 --- a/ports/winnt/vs2005/ntpd.vcproj +++ b/ports/winnt/vs2005/ntpd.vcproj @@ -44,7 +44,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=".,..\..\..\ntpd,..\include,..\..\..\include,..\..\..\lib\isc\win32\include,..\..\..\lib\isc\include,$(OPENSSL_INC),..\..\..\sntp\libopts" + AdditionalIncludeDirectories=".,..\..\..\ntpd,..\include,..\..\..\include,..\..\..\libntp\lib\isc\win32\include,..\..\..\libntp\lib\isc\include,$(OPENSSL_INC),..\..\..\sntp\libopts" PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE" StringPooling="true" RuntimeLibrary="2" @@ -136,7 +136,7 @@ diff --git a/ports/winnt/vs2005/ntpdate.vcproj b/ports/winnt/vs2005/ntpdate.vcproj index 2e40cad47..6065841b5 100644 --- a/ports/winnt/vs2005/ntpdate.vcproj +++ b/ports/winnt/vs2005/ntpdate.vcproj @@ -43,7 +43,7 @@ - - diff --git a/ports/winnt/vs2013/common.props b/ports/winnt/vs2013/common.props index 1581c51f5..4e33e9afc 100644 --- a/ports/winnt/vs2013/common.props +++ b/ports/winnt/vs2013/common.props @@ -17,7 +17,7 @@ $(IntDir)BuildLog.htm - $(VC_IncludePath);..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\include;..\..\..\..\lib\isc\include;..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) + $(VC_IncludePath);..\..\include;..\..\..\..\libntp\lib\isc\win32\include;..\..\..\..\include;..\..\..\..\libntp\lib\isc\include;..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) _CONSOLE;_WINDOWS;WIN32;SYS_WINNT;HAVE_CONFIG_H;HAVE_ARC4RANDOM_BUF;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj b/ports/winnt/vs2013/libntp/libntp.vcxproj index 50a86e413..01a56e77e 100644 --- a/ports/winnt/vs2013/libntp/libntp.vcxproj +++ b/ports/winnt/vs2013/libntp/libntp.vcxproj @@ -282,35 +282,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -367,27 +366,27 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/ports/winnt/vs2015/common.props b/ports/winnt/vs2015/common.props index 1581c51f5..4e33e9afc 100644 --- a/ports/winnt/vs2015/common.props +++ b/ports/winnt/vs2015/common.props @@ -17,7 +17,7 @@ $(IntDir)BuildLog.htm - $(VC_IncludePath);..\..\include;..\..\..\..\lib\isc\win32\include;..\..\..\..\include;..\..\..\..\lib\isc\include;..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) + $(VC_IncludePath);..\..\include;..\..\..\..\libntp\lib\isc\win32\include;..\..\..\..\include;..\..\..\..\libntp\lib\isc\include;..\..\..\..\sntp\libopts;%(AdditionalIncludeDirectories) _CONSOLE;_WINDOWS;WIN32;SYS_WINNT;HAVE_CONFIG_H;HAVE_ARC4RANDOM_BUF;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true diff --git a/ports/winnt/vs2015/libntp/libntp.vcxproj b/ports/winnt/vs2015/libntp/libntp.vcxproj index c0dfeee08..542186d53 100644 --- a/ports/winnt/vs2015/libntp/libntp.vcxproj +++ b/ports/winnt/vs2015/libntp/libntp.vcxproj @@ -282,35 +282,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -367,27 +366,27 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/sntp/check-libntp.mf b/sntp/check-libntp.mf index d38796857..649f605a8 100644 --- a/sntp/check-libntp.mf +++ b/sntp/check-libntp.mf @@ -1,14 +1,15 @@ ## check-libntp.mf - automake fragment ## -## tests/libntp/Makefile.am -## sntp/tests/Makefile.am -## The above files have adaptations of this for deeper nesting. +## ../check-libntp.mf +## The above file has a version of this for the non-sntp portion +## of the NTP package. BUILT_SOURCES += check-libntp CLEANFILES += check-libntp -check-libntp: ../libntp/libntp.a +check-libntp: $(top_builddir)/../libntp/libntp.a + @: avoid default SCCS get by some make implementations -../libntp/libntp.a: - cd ../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a +$(top_builddir)/../libntp/libntp.a: + cd $(top_builddir)/../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a diff --git a/sntp/check-libsntp.mf b/sntp/check-libsntp.mf new file mode 100644 index 000000000..d05a3d02f --- /dev/null +++ b/sntp/check-libsntp.mf @@ -0,0 +1,13 @@ +## +## check-libsntp.mf - automake fragment +## + +BUILT_SOURCES += check-libsntp +CLEANFILES += check-libsntp + +check-libsntp: $(top_builddir)/sntp/libsntp.a + @: avoid default SCCS get by some make implementations + +$(top_builddir)/sntp/libsntp.a: + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) libsntp.a + diff --git a/sntp/check-libunity.mf b/sntp/check-libunity.mf new file mode 100644 index 000000000..bf5ec3bde --- /dev/null +++ b/sntp/check-libunity.mf @@ -0,0 +1,15 @@ +## check-libunity.mf - automake fragment +## +## ../check-libunity.mf +## The above file has a version of this for the non-sntp +## part of the ntp tree. + +BUILT_SOURCES += check-libunity +CLEANFILES += check-libunity + +check-libunity: $(top_builddir)/unity/libunity.a + @: avoid default SCCS get by some make implementations + +$(top_builddir)/unity/libunity.a: + cd $(top_builddir)/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a + diff --git a/sntp/configure.ac b/sntp/configure.ac index f6de8a134..796a95186 100644 --- a/sntp/configure.ac +++ b/sntp/configure.ac @@ -40,7 +40,7 @@ sntp_configure_cache_version=20120806 NTP_CACHEVERSION([sntp], [$sntp_configure_cache_version]) -AM_INIT_AUTOMAKE([1.15 foreign -Wall -Wno-gnu]) +AM_INIT_AUTOMAKE([1.15 foreign subdir-objects -Wall -Wno-gnu]) AM_SILENT_RULES([yes]) @@ -58,11 +58,7 @@ NTP_HARDEN NTP_LOCINFO() -dnl AM_PROG_AR req. automake 1.12 -m4_ifdef( - [AM_PROG_AR], - [AM_PROG_AR] -) +AM_PROG_AR NTP_LIBNTP diff --git a/sntp/deps-ver b/sntp/deps-ver index 596602f02..abd139968 100644 --- a/sntp/deps-ver +++ b/sntp/deps-ver @@ -1 +1 @@ -Mon Jan 31 21:14:29 UTC 2011 +Mon Jan 16 09:26:08 UTC 2023 diff --git a/sntp/includes.mf b/sntp/includes.mf index 9ba126df4..d717aea53 100644 --- a/sntp/includes.mf +++ b/sntp/includes.mf @@ -1,6 +1,6 @@ ## includes.mf - automake fragment SNTP_INCS = -I$(top_srcdir)/../include -SNTP_INCS += -I$(top_srcdir)/../lib/isc/include -SNTP_INCS += -I$(top_srcdir)/../lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include -SNTP_INCS += -I$(top_srcdir)/../lib/isc/unix/include +SNTP_INCS += -I$(top_srcdir)/../libntp/lib/isc/include +SNTP_INCS += -I$(top_srcdir)/../libntp/lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include +SNTP_INCS += -I$(top_srcdir)/../libntp/lib/isc/unix/include diff --git a/sntp/m4/ntp_crypto_rand.m4 b/sntp/m4/ntp_crypto_rand.m4 index c529f3a51..9d554226f 100644 --- a/sntp/m4/ntp_crypto_rand.m4 +++ b/sntp/m4/ntp_crypto_rand.m4 @@ -18,6 +18,7 @@ # as-is, without any warranty. AC_DEFUN([NTP_CRYPTO_RAND], [ +AC_REQUIRE([NTP_OPENSSL])dnl dnl check for --disable-openssl-random dnl if that's not specified: @@ -42,8 +43,8 @@ LIBS="$NTPO_SAVED_LIBS $LDADD_NTP" dnl AC_MSG_NOTICE([LIBS is <$LIBS>]) AC_CHECK_FUNCS([RAND_bytes RAND_poll]) LIBS="$NTPO_SAVED_LIBS" -case "$ntp_use_openssl_random$ac_cv_func_RAND_bytes$ac_cv_func_RAND_poll" in - yesyesyes) +case "$ntp_openssl$ntp_use_openssl_random$ac_cv_func_RAND_bytes$ac_cv_func_RAND_poll" in + yesyesyesyes) AC_DEFINE([USE_OPENSSL_CRYPTO_RAND], [1], [Use OpenSSL's crypto random functions]) ;; *) ntp_use_openssl_random=no ;; diff --git a/sntp/tests/Makefile.am b/sntp/tests/Makefile.am index 0a0d2800b..e1f82f22c 100644 --- a/sntp/tests/Makefile.am +++ b/sntp/tests/Makefile.am @@ -14,6 +14,8 @@ CLEANFILES = \ $(NULL) DISTCLEANFILES = \ + .version \ + version.c kod-output-blank \ kod-output-single \ kod-output-multiple \ @@ -108,7 +110,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,33 +130,33 @@ BUILT_SOURCES += \ test_networking_SOURCES = \ networking.c \ run-networking.c \ - $(top_builddir)/version.c \ + version.c \ $(NULL) test_packetHandling_SOURCES = \ packetHandling.c \ run-packetHandling.c \ - $(top_builddir)/version.c \ + version.c \ $(NULL) test_kodDatabase_SOURCES = \ kodDatabase.c \ run-kodDatabase.c \ - $(top_builddir)/version.c \ + version.c \ $(NULL) test_keyFile_SOURCES = \ fileHandlingTest.c \ keyFile.c \ run-keyFile.c \ - $(top_builddir)/version.c \ + version.c \ $(NULL) test_kodFile_SOURCES = \ fileHandlingTest.c \ kodFile.c \ run-kodFile.c \ - $(top_builddir)/version.c \ + version.c \ $(NULL) test_packetProcessing_SOURCES = \ @@ -178,13 +179,13 @@ test_crypto_CFLAGS = \ test_crypto_SOURCES = \ crypto.c \ run-crypto.c \ - $(top_builddir)/version.c \ + version.c \ $(NULL) test_log_SOURCES = \ - t-log.c \ + t-log.c \ run-t-log.c \ - $(top_builddir)/version.c \ + version.c \ $(NULL) @@ -215,10 +216,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 +225,17 @@ 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: ../../libntp/libntp.a ../unity/libunity.a Makefile $(top_srcdir)/scm-rev + env CSET=`cat $(srcdir)/../scm-rev` $(top_builddir)/../scripts/build/mkver sntp-tests -check-libunity: ../unity/libunity.a - @echo stamp > $@ +version.o: version.c + env CCACHE_DISABLE=1 $(COMPILE) -c version.c -o version.o -../unity/libunity.a: - cd ../unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a +$(top_srcdir)/scm-rev: + cd .. && $(MAKE) $(AM_MAKEFLAGS) check-scm-rev +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/sntp/unity/Makefile.am b/sntp/unity/Makefile.am index 24a44257a..a7d5d9c56 100644 --- a/sntp/unity/Makefile.am +++ b/sntp/unity/Makefile.am @@ -1,7 +1,7 @@ -#AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects NULL = BUILT_SOURCES = CLEANFILES = +DISTCLEANFILES = AM_CFLAGS = $(NTP_HARD_CFLAGS) AM_CPPFLAGS = $(NTP_HARD_CPPFLAGS) @@ -15,7 +15,7 @@ libunity_a_CFLAGS = \ $(NULL) libunity_a_SOURCES = \ - ../libpkgver/colcomp.c \ + libpkgver-colcomp.c \ unity.c \ ulib_setup.c \ ulib_teardown.c \ diff --git a/sntp/unity/libpkgver-colcomp.c b/sntp/unity/libpkgver-colcomp.c new file mode 100644 index 000000000..52e3f2b7c --- /dev/null +++ b/sntp/unity/libpkgver-colcomp.c @@ -0,0 +1 @@ +#include "../libpkgver/colcomp.c" diff --git a/tests/bug-2803/Makefile.am b/tests/bug-2803/Makefile.am index be88a5a30..142f38c60 100644 --- a/tests/bug-2803/Makefile.am +++ b/tests/bug-2803/Makefile.am @@ -1,7 +1,7 @@ -#AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects NULL = BUILT_SOURCES = CLEANFILES = +DISTCLEANFILES = std_unity_list = \ $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ @@ -59,23 +59,7 @@ if !NTP_CROSSCOMPILE TESTS += $(check_PROGRAMS) endif -## 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 - -check-libunity: ../../sntp/unity/libunity.a - @echo stamp > $@ - -../../sntp/unity/libunity.a: - cd ../../sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a - +include $(top_srcdir)/check-libntp.mf +include $(top_srcdir)/check-libunity.mf include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/tests/libntp/Makefile.am b/tests/libntp/Makefile.am index 740fbd485..a1d37ecab 100644 --- a/tests/libntp/Makefile.am +++ b/tests/libntp/Makefile.am @@ -1,6 +1,7 @@ NULL = BUILT_SOURCES = CLEANFILES = +DISTCLEANFILES = std_unity_list = \ $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ @@ -578,23 +579,7 @@ if !NTP_CROSSCOMPILE TESTS += $(check_PROGRAMS) endif -## 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 - -check-libunity: ../../sntp/unity/libunity.a - @echo stamp > $@ - -../../sntp/unity/libunity.a: - cd ../../sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a - +include $(top_srcdir)/check-libntp.mf +include $(top_srcdir)/check-libunity.mf include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/tests/ntpd/Makefile.am b/tests/ntpd/Makefile.am index 35ebcde33..24830f917 100644 --- a/tests/ntpd/Makefile.am +++ b/tests/ntpd/Makefile.am @@ -1,6 +1,7 @@ NULL = BUILT_SOURCES = CLEANFILES = +DISTCLEANFILES = std_unity_list = \ $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ @@ -89,7 +90,7 @@ test_leapsec_LDADD = \ test_leapsec_SOURCES = \ leapsec.c \ run-leapsec.c \ - $(srcdir)/../libntp/test-libntp.c \ + test-libntp.c \ $(NULL) $(srcdir)/run-leapsec.c: $(srcdir)/leapsec.c $(std_unity_list) @@ -109,12 +110,14 @@ test_ntp_prio_q_LDADD = \ test_ntp_prio_q_SOURCES = \ ntp_prio_q.c \ run-ntp_prio_q.c \ - $(srcdir)/../libntp/test-libntp.c \ + test-libntp.c \ $(NULL) $(srcdir)/run-ntp_prio_q.c: $(srcdir)/ntp_prio_q.c $(std_unity_list) $(run_unity) $< $@ +../../ntpd/ntpdsim-ntp_prio_q.o: + cd ../../ntpd && $(MAKE) $(AM_MAKEFLAGS) ntpdsim-ntp_prio_q.o ### test_ntp_restrict_CFLAGS = \ @@ -129,7 +132,7 @@ test_ntp_restrict_LDADD = \ test_ntp_restrict_SOURCES = \ ntp_restrict.c \ run-ntp_restrict.c \ - $(srcdir)/../libntp/test-libntp.c \ + test-libntp.c \ $(NULL) $(srcdir)/run-ntp_restrict.c: $(srcdir)/ntp_restrict.c $(std_unity_list) @@ -150,7 +153,7 @@ test_rc_cmdlength_LDADD = \ test_rc_cmdlength_SOURCES = \ rc_cmdlength.c \ run-rc_cmdlength.c \ - $(srcdir)/../libntp/test-libntp.c \ + test-libntp.c \ $(NULL) $(srcdir)/run-rc_cmdlength.c: $(srcdir)/rc_cmdlength.c $(std_unity_list) @@ -167,7 +170,7 @@ test_ntp_signd_LDADD = \ test_ntp_signd_SOURCES = \ t-ntp_signd.c \ run-t-ntp_signd.c \ - $(srcdir)/../libntp/test-libntp.c \ + test-libntp.c \ $(NULL) $(srcdir)/run-t-ntp_signd.c: $(srcdir)/t-ntp_signd.c $(std_unity_list) @@ -189,7 +192,7 @@ test_ntp_scanner_LDADD = \ test_ntp_scanner_SOURCES = \ t-ntp_scanner.c \ run-t-ntp_scanner.c \ - $(srcdir)/../libntp/test-libntp.c \ + test-libntp.c \ $(NULL) $(srcdir)/run-t-ntp_scanner.c: $(srcdir)/t-ntp_scanner.c $(std_unity_list) @@ -202,34 +205,8 @@ if !NTP_CROSSCOMPILE TESTS += $(check_PROGRAMS) endif -## check-libntp.mf - automake fragment -## slightly adapted for deeper directory - -BUILT_SOURCES += check-libntpd check-libntp check-libunity -CLEANFILES += check-libntpd check-libntp check-libunity - -check-libntpd: ../../ntpd/libntpd.a - @echo stamp > $@ - -../../ntpd/libntpd.a: - cd ../../ntpd && $(MAKE) $(AM_MAKEFLAGS) libntpd.a - - -check-libntp: ../../libntp/libntp.a - @echo stamp > $@ - -../../libntp/libntp.a: - cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a - - -check-libunity: ../../sntp/unity/libunity.a - @echo stamp > $@ - -../../sntp/unity/libunity.a: - cd ../../sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a - -$(top_builddir)/ntpd/ntpdsim-ntp_prio_q.o: - cd ../../ntpd/ && $(MAKE) $(AM_MAKEFLAGS) ntpdsim-ntp_prio_q.o - +include $(top_srcdir)/check-libntp.mf +include $(top_srcdir)/check-libntpd.mf +include $(top_srcdir)/check-libunity.mf include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/tests/ntpd/test-libntp.c b/tests/ntpd/test-libntp.c new file mode 100644 index 000000000..91d4b3af4 --- /dev/null +++ b/tests/ntpd/test-libntp.c @@ -0,0 +1,2 @@ +#include "../libntp/test-libntp.c" + diff --git a/tests/ntpq/Makefile.am b/tests/ntpq/Makefile.am index 23ca1814b..9d244258e 100644 --- a/tests/ntpq/Makefile.am +++ b/tests/ntpq/Makefile.am @@ -1,6 +1,7 @@ NULL = BUILT_SOURCES = CLEANFILES = +DISTCLEANFILES = std_unity_list = \ $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ @@ -19,7 +20,6 @@ check_PROGRAMS = \ LDADD = \ $(top_builddir)/ntpq/libntpq.a \ - $(top_builddir)/ntpd/libntpd.a \ $(top_builddir)/libntp/libntp.a \ $(LDADD_LIBNTP) \ $(PTHREAD_LIBS) \ @@ -74,32 +74,7 @@ if !NTP_CROSSCOMPILE TESTS += $(check_PROGRAMS) endif -## check-libntp.mf - automake fragment -## slightly adapted for deeper directory - -BUILT_SOURCES += check-libntpd check-libntp check-libunity -CLEANFILES += check-libntpd check-libntp check-libunity - -check-libntpd: ../../ntpd/libntpd.a - @echo stamp > $@ - -../../ntpd/libntpd.a: - cd ../../ntpd && $(MAKE) $(AM_MAKEFLAGS) libntpd.a - - -check-libntp: ../../libntp/libntp.a - @echo stamp > $@ - -../../libntp/libntp.a: - cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a - - -check-libunity: ../../sntp/unity/libunity.a - @echo stamp > $@ - -../../sntp/unity/libunity.a: - cd ../../sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a - - +include $(top_srcdir)/check-libntp.mf +include $(top_srcdir)/check-libunity.mf include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/tests/sandbox/Makefile.am b/tests/sandbox/Makefile.am index f89c85868..31745fe4a 100644 --- a/tests/sandbox/Makefile.am +++ b/tests/sandbox/Makefile.am @@ -1,8 +1,7 @@ -#AUTOMAKE_OPTIONS = foreign 2.9 subdir-objects - NULL = BUILT_SOURCES = CLEANFILES = +DISTCLEANFILES = std_unity_list = \ $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ @@ -85,23 +84,7 @@ if !NTP_CROSSCOMPILE TESTS += $(check_PROGRAMS) endif -## 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 - -check-libunity: ../../sntp/unity/libunity.a - @echo stamp > $@ - -../../sntp/unity/libunity.a: - cd ../../libunity && $(MAKE) $(AM_MAKEFLAGS) libunity.a - +include $(top_srcdir)/check-libntp.mf +include $(top_srcdir)/check-libunity.mf include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/tests/sec-2853/Makefile.am b/tests/sec-2853/Makefile.am index 4078cf40b..4406baa1b 100644 --- a/tests/sec-2853/Makefile.am +++ b/tests/sec-2853/Makefile.am @@ -2,6 +2,7 @@ NULL = BUILT_SOURCES = CLEANFILES = +DISTCLEANFILES = std_unity_list = \ $(abs_top_srcdir)/sntp/unity/auto/generate_test_runner.rb \ @@ -18,9 +19,9 @@ check_PROGRAMS = sec-2853 # HMS: we may not need some of these: LDADD = \ - $(top_builddir)/ntpd/rc_cmdlength.o \ $(top_builddir)/sntp/unity/libunity.a \ $(top_builddir)/libntp/libntp.a \ + $(top_builddir)/ntpd/libntpd.a \ $(LDADD_LIBNTP) \ $(PTHREAD_LIBS) \ $(LDADD_NTP) \ @@ -62,29 +63,8 @@ if !NTP_CROSSCOMPILE TESTS += $(check_PROGRAMS) endif -## check-libntp.mf - automake fragment -## slightly adapted for deeper directory - -BUILT_SOURCES += check-libntp check-libunity check-rc-cmdlength -CLEANFILES += check-libntp check-libunity check-rc-cmdlength - -check-libntp: ../../libntp/libntp.a - @echo stamp > $@ - -../../libntp/libntp.a: - cd ../../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a - -check-libunity: ../../sntp/unity/libunity.a - @echo stamp > $@ - -../../sntp/unity/libunity.a: - cd ../../libunity && $(MAKE) $(AM_MAKEFLAGS) libunity.a - -check-rc-cmdlength: ../../ntpd/rc_cmdlength.o - @echo stamp > $@ - -../../ntpd/rc_cmdlength.o: - cd ../../ntpd && $(MAKE) $(AM_MAKEFLAGS) rc_cmdlength.o - +include $(top_srcdir)/check-libntp.mf +include $(top_srcdir)/check-libntpd.mf +include $(top_srcdir)/check-libunity.mf include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf diff --git a/util/Makefile.am b/util/Makefile.am index 8d8067d39..939ce6be6 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -133,7 +133,7 @@ version.o: version.c env CCACHE_DISABLE=1 $(COMPILE) -c version.c -o version.o include $(top_srcdir)/bincheck.mf -include $(top_srcdir)/sntp/check-libntp.mf +include $(top_srcdir)/check-libntp.mf include $(top_srcdir)/check-libopts.mf include $(top_srcdir)/depsver.mf include $(top_srcdir)/includes.mf