Virgin import of ntpd 4.0.99b

9 files changed, 680 insertions, 419 deletions

diff --git a/contrib/ntp/libntp/Makefile.am b/contrib/ntp/libntp/Makefile.am
index 9ba3c09..c984c89 100644
--- a/contrib/ntp/libntp/Makefile.am
+++ b/contrib/ntp/libntp/Makefile.am
@@ -7,11 +7,12 @@ libntp_a_SOURCES = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
 	clocktime.c clocktypes.c decodenetnum.c dofptoa.c dolfptoa.c \
 	emalloc.c findconfig.c fptoa.c fptoms.c getopt.c hextoint.c \
 	hextolfp.c humandate.c inttoa.c lib_strbuf.c machines.c md5c.c \
-	memmove.c mexit.c mfptoa.c mfptoms.c modetoa.c mstolfp.c msutotsf.c \
+	memmove.c mfptoa.c mfptoms.c modetoa.c mstolfp.c msutotsf.c \
 	msyslog.c netof.c numtoa.c numtohost.c octtoint.c prettydate.c \
 	ranny.c refnumtoa.c statestr.c syssignal.c systime.c tsftomsu.c \
 	tstotv.c tvtoa.c tvtots.c uglydate.c uinttoa.c utvtoa.c ymd2yd.c \
-	mfp_mul.c binio.c ieee754io.c gpstolfp.c recvbuff.c iosignal.c
+	mfp_mul.c binio.c ieee754io.c gpstolfp.c recvbuff.c iosignal.c \
+	icom.c audio.c
 libntp_a_LIBADD = @LIBOBJS@
 libntp_a_DEPENDENCIES = @LIBOBJS@
 INCLUDES = -I$(top_srcdir)/include
diff --git a/contrib/ntp/libntp/Makefile.in b/contrib/ntp/libntp/Makefile.in
index 53eda67..c89e8f9 100644
--- a/contrib/ntp/libntp/Makefile.in
+++ b/contrib/ntp/libntp/Makefile.in
@@ -63,15 +63,18 @@ host_alias = @host_alias@
 host_triplet = @host@
 target_alias = @target_alias@
 target_triplet = @target@
+AMDEP = @AMDEP@
 AMTAR = @AMTAR@
-AMTARFLAGS = @AMTARFLAGS@
 AWK = @AWK@
 CC = @CC@
 CFLAGS = @CFLAGS@
 CHUTEST = @CHUTEST@
 CLKTEST = @CLKTEST@
 CPP = @CPP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
 DCFD = @DCFD@
+DEPDIR = @DEPDIR@
 LDFLAGS = @LDFLAGS@
 LIBPARSE = @LIBPARSE@
 LIBRSAREF = @LIBRSAREF@
@@ -93,6 +96,7 @@ RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
+install_sh = @install_sh@
 
 #AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies
 
@@ -105,11 +109,12 @@ libntp_a_SOURCES = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
 	clocktime.c clocktypes.c decodenetnum.c dofptoa.c dolfptoa.c \
 	emalloc.c findconfig.c fptoa.c fptoms.c getopt.c hextoint.c \
 	hextolfp.c humandate.c inttoa.c lib_strbuf.c machines.c md5c.c \
-	memmove.c mexit.c mfptoa.c mfptoms.c modetoa.c mstolfp.c msutotsf.c \
+	memmove.c mfptoa.c mfptoms.c modetoa.c mstolfp.c msutotsf.c \
 	msyslog.c netof.c numtoa.c numtohost.c octtoint.c prettydate.c \
 	ranny.c refnumtoa.c statestr.c syssignal.c systime.c tsftomsu.c \
 	tstotv.c tvtoa.c tvtots.c uglydate.c uinttoa.c utvtoa.c ymd2yd.c \
-	mfp_mul.c binio.c ieee754io.c gpstolfp.c recvbuff.c iosignal.c
+	mfp_mul.c binio.c ieee754io.c gpstolfp.c recvbuff.c iosignal.c \
+	icom.c audio.c
 
 libntp_a_LIBADD = @LIBOBJS@
 libntp_a_DEPENDENCIES = @LIBOBJS@
@@ -130,6 +135,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 ANSI2KNR = ../util/ansi2knr
+libntp_a_AR = $(AR) cru
 am_libntp_a_OBJECTS =  a_md5encrypt$U.o adjtime$U.o atoint$U.o \
 atolfp$U.o atouint$U.o authencrypt$U.o authkeys$U.o authparity$U.o \
 authreadkeys$U.o authusekey$U.o buftvtots$U.o caljulian$U.o \
@@ -137,12 +143,12 @@ calleapwhen$U.o caltontp$U.o calyearstart$U.o clocktime$U.o \
 clocktypes$U.o decodenetnum$U.o dofptoa$U.o dolfptoa$U.o emalloc$U.o \
 findconfig$U.o fptoa$U.o fptoms$U.o getopt$U.o hextoint$U.o \
 hextolfp$U.o humandate$U.o inttoa$U.o lib_strbuf$U.o machines$U.o \
-md5c$U.o memmove$U.o mexit$U.o mfptoa$U.o mfptoms$U.o modetoa$U.o \
-mstolfp$U.o msutotsf$U.o msyslog$U.o netof$U.o numtoa$U.o numtohost$U.o \
+md5c$U.o memmove$U.o mfptoa$U.o mfptoms$U.o modetoa$U.o mstolfp$U.o \
+msutotsf$U.o msyslog$U.o netof$U.o numtoa$U.o numtohost$U.o \
 octtoint$U.o prettydate$U.o ranny$U.o refnumtoa$U.o statestr$U.o \
 syssignal$U.o systime$U.o tsftomsu$U.o tstotv$U.o tvtoa$U.o tvtots$U.o \
 uglydate$U.o uinttoa$U.o utvtoa$U.o ymd2yd$U.o mfp_mul$U.o binio$U.o \
-ieee754io$U.o gpstolfp$U.o recvbuff$U.o iosignal$U.o
+ieee754io$U.o gpstolfp$U.o recvbuff$U.o iosignal$U.o icom$U.o audio$U.o
 libntp_a_OBJECTS =  $(am_libntp_a_OBJECTS)
 AR = ar
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -158,6 +164,32 @@ strerror.c
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP_ENV = --best
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+DEP_FILES =  @AMDEP@ $(DEPDIR)/a_md5encrypt$U.Po $(DEPDIR)/adjtime$U.Po \
+$(DEPDIR)/atoint$U.Po $(DEPDIR)/atolfp$U.Po $(DEPDIR)/atouint$U.Po \
+$(DEPDIR)/audio$U.Po $(DEPDIR)/authencrypt$U.Po $(DEPDIR)/authkeys$U.Po \
+$(DEPDIR)/authparity$U.Po $(DEPDIR)/authreadkeys$U.Po \
+$(DEPDIR)/authusekey$U.Po $(DEPDIR)/binio$U.Po $(DEPDIR)/buftvtots$U.Po \
+$(DEPDIR)/caljulian$U.Po $(DEPDIR)/calleapwhen$U.Po \
+$(DEPDIR)/caltontp$U.Po $(DEPDIR)/calyearstart$U.Po \
+$(DEPDIR)/clocktime$U.Po $(DEPDIR)/clocktypes$U.Po \
+$(DEPDIR)/decodenetnum$U.Po $(DEPDIR)/dofptoa$U.Po \
+$(DEPDIR)/dolfptoa$U.Po $(DEPDIR)/emalloc$U.Po \
+$(DEPDIR)/findconfig$U.Po $(DEPDIR)/fptoa$U.Po $(DEPDIR)/fptoms$U.Po \
+$(DEPDIR)/getopt$U.Po $(DEPDIR)/gpstolfp$U.Po $(DEPDIR)/hextoint$U.Po \
+$(DEPDIR)/hextolfp$U.Po $(DEPDIR)/humandate$U.Po $(DEPDIR)/icom$U.Po \
+$(DEPDIR)/ieee754io$U.Po $(DEPDIR)/inttoa$U.Po $(DEPDIR)/iosignal$U.Po \
+$(DEPDIR)/lib_strbuf$U.Po $(DEPDIR)/machines$U.Po $(DEPDIR)/md5c$U.Po \
+$(DEPDIR)/memmove$U.Po $(DEPDIR)/mfp_mul$U.Po $(DEPDIR)/mfptoa$U.Po \
+$(DEPDIR)/mfptoms$U.Po $(DEPDIR)/mktime.Po $(DEPDIR)/modetoa$U.Po \
+$(DEPDIR)/mstolfp$U.Po $(DEPDIR)/msutotsf$U.Po $(DEPDIR)/msyslog$U.Po \
+$(DEPDIR)/netof$U.Po $(DEPDIR)/numtoa$U.Po $(DEPDIR)/numtohost$U.Po \
+$(DEPDIR)/octtoint$U.Po $(DEPDIR)/prettydate$U.Po $(DEPDIR)/ranny$U.Po \
+$(DEPDIR)/recvbuff$U.Po $(DEPDIR)/refnumtoa$U.Po \
+$(DEPDIR)/statestr$U.Po $(DEPDIR)/strerror.Po $(DEPDIR)/syssignal$U.Po \
+$(DEPDIR)/systime$U.Po $(DEPDIR)/tsftomsu$U.Po $(DEPDIR)/tstotv$U.Po \
+$(DEPDIR)/tvtoa$U.Po $(DEPDIR)/tvtots$U.Po $(DEPDIR)/uglydate$U.Po \
+$(DEPDIR)/uinttoa$U.Po $(DEPDIR)/utvtoa$U.Po $(DEPDIR)/ymd2yd$U.Po
 SOURCES = $(libntp_a_SOURCES)
 OBJECTS = $(am_libntp_a_OBJECTS)
 
@@ -165,9 +197,9 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .c .o
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libntp/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu libntp/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -181,9 +213,6 @@ distclean-noinstLIBRARIES:
 
 maintainer-clean-noinstLIBRARIES:
 
-.c.o:
-	$(COMPILE) -c $<
-
 mostlyclean-compile:
 	-rm -f *.o core *.core
 
@@ -208,74 +237,10 @@ clean-kr:
 distclean-kr:
 
 maintainer-clean-kr:
-a_md5encrypt$U.o:
-adjtime$U.o:
-atoint$U.o:
-atolfp$U.o:
-atouint$U.o:
-authencrypt$U.o:
-authkeys$U.o:
-authparity$U.o:
-authreadkeys$U.o:
-authusekey$U.o:
-buftvtots$U.o:
-caljulian$U.o:
-calleapwhen$U.o:
-caltontp$U.o:
-calyearstart$U.o:
-clocktime$U.o:
-clocktypes$U.o:
-decodenetnum$U.o:
-dofptoa$U.o:
-dolfptoa$U.o:
-emalloc$U.o:
-findconfig$U.o:
-fptoa$U.o:
-fptoms$U.o:
-getopt$U.o:
-hextoint$U.o:
-hextolfp$U.o:
-humandate$U.o:
-inttoa$U.o:
-lib_strbuf$U.o:
-machines$U.o:
-md5c$U.o:
-memmove$U.o:
-mexit$U.o:
-mfptoa$U.o:
-mfptoms$U.o:
-modetoa$U.o:
-mstolfp$U.o:
-msutotsf$U.o:
-msyslog$U.o:
-netof$U.o:
-numtoa$U.o:
-numtohost$U.o:
-octtoint$U.o:
-prettydate$U.o:
-ranny$U.o:
-refnumtoa$U.o:
-statestr$U.o:
-syssignal$U.o:
-systime$U.o:
-tsftomsu$U.o:
-tstotv$U.o:
-tvtoa$U.o:
-tvtots$U.o:
-uglydate$U.o:
-uinttoa$U.o:
-utvtoa$U.o:
-ymd2yd$U.o:
-mfp_mul$U.o:
-binio$U.o:
-ieee754io$U.o:
-gpstolfp$U.o:
-recvbuff$U.o:
-iosignal$U.o:
 
 libntp.a: $(libntp_a_OBJECTS) $(libntp_a_DEPENDENCIES)
 	-rm -f libntp.a
-	$(AR) cru libntp.a $(libntp_a_OBJECTS) $(libntp_a_LIBADD)
+	$(libntp_a_AR) libntp.a $(libntp_a_OBJECTS) $(libntp_a_LIBADD)
 	$(RANLIB) libntp.a
 a_md5encrypt_.c: a_md5encrypt.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/a_md5encrypt.c; then echo $(srcdir)/a_md5encrypt.c; else echo a_md5encrypt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > a_md5encrypt_.c
@@ -287,6 +252,8 @@ atolfp_.c: atolfp.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/atolfp.c; then echo $(srcdir)/atolfp.c; else echo atolfp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > atolfp_.c
 atouint_.c: atouint.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/atouint.c; then echo $(srcdir)/atouint.c; else echo atouint.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > atouint_.c
+audio_.c: audio.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/audio.c; then echo $(srcdir)/audio.c; else echo audio.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > audio_.c
 authencrypt_.c: authencrypt.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/authencrypt.c; then echo $(srcdir)/authencrypt.c; else echo authencrypt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > authencrypt_.c
 authkeys_.c: authkeys.c $(ANSI2KNR)
@@ -337,6 +304,8 @@ hextolfp_.c: hextolfp.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hextolfp.c; then echo $(srcdir)/hextolfp.c; else echo hextolfp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > hextolfp_.c
 humandate_.c: humandate.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/humandate.c; then echo $(srcdir)/humandate.c; else echo humandate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > humandate_.c
+icom_.c: icom.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/icom.c; then echo $(srcdir)/icom.c; else echo icom.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > icom_.c
 ieee754io_.c: ieee754io.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ieee754io.c; then echo $(srcdir)/ieee754io.c; else echo ieee754io.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ieee754io_.c
 inttoa_.c: inttoa.c $(ANSI2KNR)
@@ -351,8 +320,6 @@ md5c_.c: md5c.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/md5c.c; then echo $(srcdir)/md5c.c; else echo md5c.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > md5c_.c
 memmove_.c: memmove.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memmove.c; then echo $(srcdir)/memmove.c; else echo memmove.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > memmove_.c
-mexit_.c: mexit.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mexit.c; then echo $(srcdir)/mexit.c; else echo mexit.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mexit_.c
 mfp_mul_.c: mfp_mul.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mfp_mul.c; then echo $(srcdir)/mfp_mul.c; else echo mfp_mul.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > mfp_mul_.c
 mfptoa_.c: mfptoa.c $(ANSI2KNR)
@@ -409,13 +376,13 @@ utvtoa_.c: utvtoa.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/utvtoa.c; then echo $(srcdir)/utvtoa.c; else echo utvtoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > utvtoa_.c
 ymd2yd_.c: ymd2yd.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ymd2yd.c; then echo $(srcdir)/ymd2yd.c; else echo ymd2yd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ymd2yd_.c
-a_md5encrypt_.o adjtime_.o atoint_.o atolfp_.o atouint_.o \
+a_md5encrypt_.o adjtime_.o atoint_.o atolfp_.o atouint_.o audio_.o \
 authencrypt_.o authkeys_.o authparity_.o authreadkeys_.o authusekey_.o \
 binio_.o buftvtots_.o caljulian_.o calleapwhen_.o caltontp_.o \
 calyearstart_.o clocktime_.o clocktypes_.o decodenetnum_.o dofptoa_.o \
 dolfptoa_.o emalloc_.o findconfig_.o fptoa_.o fptoms_.o getopt_.o \
-gpstolfp_.o hextoint_.o hextolfp_.o humandate_.o ieee754io_.o inttoa_.o \
-iosignal_.o lib_strbuf_.o machines_.o md5c_.o memmove_.o mexit_.o \
+gpstolfp_.o hextoint_.o hextolfp_.o humandate_.o icom_.o ieee754io_.o \
+inttoa_.o iosignal_.o lib_strbuf_.o machines_.o md5c_.o memmove_.o \
 mfp_mul_.o mfptoa_.o mfptoms_.o mktime_.o modetoa_.o mstolfp_.o \
 msutotsf_.o msyslog_.o netof_.o numtoa_.o numtohost_.o octtoint_.o \
 prettydate_.o ranny_.o recvbuff_.o refnumtoa_.o statestr_.o strerror_.o \
@@ -424,23 +391,27 @@ uglydate_.o uinttoa_.o utvtoa_.o ymd2yd_.o : $(ANSI2KNR)
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  ${AWK:-awk} '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -f$$here/ID $$unique $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  ${AWK:-awk} '    { files[$$0] = 1; } \
+	list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	  || etags $(ETAGS_ARGS) $$tags  $$unique $(LISP)
 
 mostlyclean-tags:
 
@@ -457,258 +428,98 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    cp -pR $$d/$$file $(distdir); \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-a_md5encrypt.o: a_md5encrypt.c ../include/ntp_machine.h ../config.h \
-	../include/ntp_proto.h ../include/ntp_types.h \
-	../include/ntp_fp.h ../include/ntp_string.h ../include/global.h \
-	../include/md5.h ../include/ntp_stdlib.h ../include/l_stdlib.h
-adjtime.o: adjtime.c ../config.h
-atoint.o: atoint.c ../include/ntp_types.h ../include/ntp_machine.h \
-	../config.h ../include/ntp_proto.h ../include/ntp_stdlib.h \
-	../include/ntp_string.h ../include/l_stdlib.h
-atolfp.o: atolfp.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_string.h
-atouint.o: atouint.c ../include/ntp_types.h ../include/ntp_machine.h \
-	../config.h ../include/ntp_proto.h ../include/ntp_stdlib.h \
-	../include/ntp_string.h ../include/l_stdlib.h
-authencrypt.o: authencrypt.c ../include/ntp_machine.h ../config.h \
-	../include/ntp_proto.h
-authkeys.o: authkeys.c ../config.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../include/ntp_proto.h \
-	../include/ntp_fp.h ../include/ntp.h ../include/ntpd.h \
-	../include/ntp_syslog.h ../include/ntp_select.h \
-	../include/ntp_malloc.h ../include/ntp_refclock.h \
-	../include/recvbuff.h ../include/ntp_string.h \
-	../include/ntp_stdlib.h ../include/l_stdlib.h
-authparity.o: authparity.c ../include/ntp_stdlib.h \
-	../include/ntp_types.h ../include/ntp_machine.h ../config.h \
-	../include/ntp_proto.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-authreadkeys.o: authreadkeys.c ../include/ntp_fp.h \
-	../include/ntp_types.h ../include/ntp_machine.h ../config.h \
-	../include/ntp_proto.h ../include/ntp.h ../include/ntp_stdlib.h \
-	../include/ntp_string.h ../include/l_stdlib.h \
-	../include/ntp_syslog.h
-authusekey.o: authusekey.c ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_string.h ../include/ntp_stdlib.h \
-	../include/l_stdlib.h
-binio.o: binio.c ../include/binio.h ../include/ntp_stdlib.h \
-	../include/ntp_types.h ../include/ntp_machine.h ../config.h \
-	../include/ntp_proto.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-buftvtots.o: buftvtots.c ../config.h ../include/ntp_fp.h \
-	../include/ntp_types.h ../include/ntp_machine.h \
-	../include/ntp_proto.h ../include/ntp_unixtime.h
-caljulian.o: caljulian.c ../include/ntp_types.h ../include/ntp_machine.h \
-	../config.h ../include/ntp_proto.h ../include/ntp_calendar.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-calleapwhen.o: calleapwhen.c ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_calendar.h ../include/ntp_stdlib.h \
-	../include/ntp_string.h ../include/l_stdlib.h
-caltontp.o: caltontp.c ../include/ntp_types.h ../include/ntp_machine.h \
-	../config.h ../include/ntp_proto.h ../include/ntp_calendar.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-calyearstart.o: calyearstart.c ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_calendar.h ../include/ntp_stdlib.h \
-	../include/ntp_string.h ../include/l_stdlib.h
-clocktime.o: clocktime.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_unixtime.h ../include/ntp_stdlib.h \
-	../include/ntp_string.h ../include/l_stdlib.h
-clocktypes.o: clocktypes.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp.h lib_strbuf.h ../include/ntp_refclock.h \
-	../include/recvbuff.h ../include/ntp_stdlib.h \
-	../include/ntp_string.h ../include/l_stdlib.h
-decodenetnum.o: decodenetnum.c ../include/ntp_stdlib.h \
-	../include/ntp_types.h ../include/ntp_machine.h ../config.h \
-	../include/ntp_proto.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-desc.o: desc.c ../include/global.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/rsaref.h ../include/md2.h ../include/md5.h \
-	../include/des.h
-dofptoa.o: dofptoa.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	lib_strbuf.h ../include/ntp_string.h ../include/ntp_stdlib.h \
-	../include/l_stdlib.h
-dolfptoa.o: dolfptoa.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	lib_strbuf.h ../include/ntp_string.h ../include/ntp_stdlib.h \
-	../include/l_stdlib.h
-emalloc.o: emalloc.c ../include/ntp_types.h ../include/ntp_machine.h \
-	../config.h ../include/ntp_proto.h ../include/ntp_malloc.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h ../include/ntp_syslog.h
-findconfig.o: findconfig.c ../config.h ../include/ntp_stdlib.h \
-	../include/ntp_types.h ../include/ntp_machine.h \
-	../include/ntp_proto.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-fptoa.o: fptoa.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-fptoms.o: fptoms.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h
-getopt.o: getopt.c ../include/ntp_stdlib.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_string.h ../include/l_stdlib.h
-gpstolfp.o: gpstolfp.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h
-hextoint.o: hextoint.c ../include/ntp_stdlib.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_string.h ../include/l_stdlib.h
-hextolfp.o: hextolfp.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_string.h ../include/ntp_stdlib.h \
-	../include/l_stdlib.h
-humandate.o: humandate.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_unixtime.h lib_strbuf.h ../include/ntp_stdlib.h \
-	../include/ntp_string.h ../include/l_stdlib.h
-ieee754io.o: ieee754io.c ../config.h ../include/l_stdlib.h \
-	../include/ntp_types.h ../include/ntp_machine.h \
-	../include/ntp_proto.h ../include/ntp_stdlib.h \
-	../include/ntp_string.h ../include/ntp_fp.h \
-	../include/ieee754io.h
-inttoa.o: inttoa.c lib_strbuf.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-iosignal.o: iosignal.c ../config.h ../include/ntp_machine.h \
-	../include/ntp_proto.h ../include/ntpd.h \
-	../include/ntp_syslog.h ../include/ntp_fp.h \
-	../include/ntp_types.h ../include/ntp.h ../include/ntp_select.h \
-	../include/ntp_malloc.h ../include/ntp_refclock.h \
-	../include/recvbuff.h ../include/ntp_io.h ../include/ntp_if.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h ../include/iosignal.h
-lib_strbuf.o: lib_strbuf.c lib_strbuf.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h
-machines.o: machines.c ../config.h ../include/ntp_machine.h \
-	../include/ntp_proto.h ../include/ntp_syslog.h \
-	../include/ntp_stdlib.h ../include/ntp_types.h \
-	../include/ntp_string.h ../include/l_stdlib.h \
-	../include/ntp_unixtime.h
-md5c.o: md5c.c ../include/global.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/md5.h
-memmove.o: memmove.c ../config.h
-mexit.o: mexit.c
-mfp_mul.o: mfp_mul.c ../include/ntp_stdlib.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_string.h ../include/l_stdlib.h \
-	../include/ntp_fp.h
-mfptoa.o: mfptoa.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-mfptoms.o: mfptoms.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-modetoa.o: modetoa.c lib_strbuf.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-mstolfp.o: mstolfp.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-msutotsf.o: msutotsf.c ../include/ntp_types.h ../include/ntp_machine.h \
-	../config.h ../include/ntp_proto.h
-msyslog.o: msyslog.c ../config.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../include/ntp_proto.h \
-	../include/ntp_string.h ../include/ntp_stdlib.h \
-	../include/l_stdlib.h ../include/ntp_syslog.h
-netof.o: netof.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-numtoa.o: numtoa.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	lib_strbuf.h ../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-numtohost.o: numtohost.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h lib_strbuf.h
-octtoint.o: octtoint.c ../include/ntp_stdlib.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_string.h ../include/l_stdlib.h
-prettydate.o: prettydate.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_unixtime.h lib_strbuf.h ../include/ntp_stdlib.h \
-	../include/ntp_string.h ../include/l_stdlib.h
-ranny.o: ranny.c ../include/ntp_stdlib.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_string.h ../include/l_stdlib.h
-recvbuff.o: recvbuff.c ../config.h ../include/ntp_machine.h \
-	../include/ntp_proto.h ../include/ntp_fp.h \
-	../include/ntp_types.h ../include/ntp_stdlib.h \
-	../include/ntp_string.h ../include/l_stdlib.h \
-	../include/ntp_syslog.h ../include/ntp_io.h \
-	../include/recvbuff.h ../include/ntp.h ../include/iosignal.h \
-	../include/ntp_refclock.h
-refnumtoa.o: refnumtoa.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	lib_strbuf.h ../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-statestr.o: statestr.c ../config.h ../include/ntp_stdlib.h \
-	../include/ntp_types.h ../include/ntp_machine.h \
-	../include/ntp_proto.h ../include/ntp_string.h \
-	../include/l_stdlib.h ../include/ntp_fp.h ../include/ntp.h \
-	lib_strbuf.h ../include/ntp_refclock.h ../include/recvbuff.h \
-	../include/ntp_control.h
-syssignal.o: syssignal.c ../config.h ../include/ntp_syslog.h \
-	../include/ntp_stdlib.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../include/ntp_proto.h \
-	../include/ntp_string.h ../include/l_stdlib.h
-systime.o: systime.c ../config.h ../include/ntp_machine.h \
-	../include/ntp_proto.h ../include/ntp_fp.h \
-	../include/ntp_types.h ../include/ntp_syslog.h \
-	../include/ntp_unixtime.h ../include/ntp_stdlib.h \
-	../include/ntp_string.h ../include/l_stdlib.h
-tsftomsu.o: tsftomsu.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-tstotv.o: tstotv.c ../include/ntp_types.h ../include/ntp_machine.h \
-	../config.h ../include/ntp_proto.h
-tvtoa.o: tvtoa.c lib_strbuf.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h ../include/ntp_unixtime.h
-tvtots.o: tvtots.c ../include/ntp_types.h ../include/ntp_machine.h \
-	../config.h ../include/ntp_proto.h
-uglydate.o: uglydate.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_unixtime.h lib_strbuf.h ../include/ntp_stdlib.h \
-	../include/ntp_string.h ../include/l_stdlib.h
-uinttoa.o: uinttoa.c lib_strbuf.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h
-utvtoa.o: utvtoa.c lib_strbuf.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_stdlib.h ../include/ntp_string.h \
-	../include/l_stdlib.h ../include/ntp_unixtime.h
-ymd2yd.o: ymd2yd.c ../include/ntp_fp.h ../include/ntp_types.h \
-	../include/ntp_machine.h ../config.h ../include/ntp_proto.h \
-	../include/ntp_unixtime.h ../include/ntp_stdlib.h \
-	../include/ntp_string.h ../include/l_stdlib.h
+
+@AMDEP@include $(DEPDIR)/a_md5encrypt$U.Po
+@AMDEP@include $(DEPDIR)/adjtime$U.Po
+@AMDEP@include $(DEPDIR)/atoint$U.Po
+@AMDEP@include $(DEPDIR)/atolfp$U.Po
+@AMDEP@include $(DEPDIR)/atouint$U.Po
+@AMDEP@include $(DEPDIR)/audio$U.Po
+@AMDEP@include $(DEPDIR)/authencrypt$U.Po
+@AMDEP@include $(DEPDIR)/authkeys$U.Po
+@AMDEP@include $(DEPDIR)/authparity$U.Po
+@AMDEP@include $(DEPDIR)/authreadkeys$U.Po
+@AMDEP@include $(DEPDIR)/authusekey$U.Po
+@AMDEP@include $(DEPDIR)/binio$U.Po
+@AMDEP@include $(DEPDIR)/buftvtots$U.Po
+@AMDEP@include $(DEPDIR)/caljulian$U.Po
+@AMDEP@include $(DEPDIR)/calleapwhen$U.Po
+@AMDEP@include $(DEPDIR)/caltontp$U.Po
+@AMDEP@include $(DEPDIR)/calyearstart$U.Po
+@AMDEP@include $(DEPDIR)/clocktime$U.Po
+@AMDEP@include $(DEPDIR)/clocktypes$U.Po
+@AMDEP@include $(DEPDIR)/decodenetnum$U.Po
+@AMDEP@include $(DEPDIR)/dofptoa$U.Po
+@AMDEP@include $(DEPDIR)/dolfptoa$U.Po
+@AMDEP@include $(DEPDIR)/emalloc$U.Po
+@AMDEP@include $(DEPDIR)/findconfig$U.Po
+@AMDEP@include $(DEPDIR)/fptoa$U.Po
+@AMDEP@include $(DEPDIR)/fptoms$U.Po
+@AMDEP@include $(DEPDIR)/getopt$U.Po
+@AMDEP@include $(DEPDIR)/gpstolfp$U.Po
+@AMDEP@include $(DEPDIR)/hextoint$U.Po
+@AMDEP@include $(DEPDIR)/hextolfp$U.Po
+@AMDEP@include $(DEPDIR)/humandate$U.Po
+@AMDEP@include $(DEPDIR)/icom$U.Po
+@AMDEP@include $(DEPDIR)/ieee754io$U.Po
+@AMDEP@include $(DEPDIR)/inttoa$U.Po
+@AMDEP@include $(DEPDIR)/iosignal$U.Po
+@AMDEP@include $(DEPDIR)/lib_strbuf$U.Po
+@AMDEP@include $(DEPDIR)/machines$U.Po
+@AMDEP@include $(DEPDIR)/md5c$U.Po
+@AMDEP@include $(DEPDIR)/memmove$U.Po
+@AMDEP@include $(DEPDIR)/mfp_mul$U.Po
+@AMDEP@include $(DEPDIR)/mfptoa$U.Po
+@AMDEP@include $(DEPDIR)/mfptoms$U.Po
+@AMDEP@include $(DEPDIR)/mktime.Po
+@AMDEP@include $(DEPDIR)/modetoa$U.Po
+@AMDEP@include $(DEPDIR)/mstolfp$U.Po
+@AMDEP@include $(DEPDIR)/msutotsf$U.Po
+@AMDEP@include $(DEPDIR)/msyslog$U.Po
+@AMDEP@include $(DEPDIR)/netof$U.Po
+@AMDEP@include $(DEPDIR)/numtoa$U.Po
+@AMDEP@include $(DEPDIR)/numtohost$U.Po
+@AMDEP@include $(DEPDIR)/octtoint$U.Po
+@AMDEP@include $(DEPDIR)/prettydate$U.Po
+@AMDEP@include $(DEPDIR)/ranny$U.Po
+@AMDEP@include $(DEPDIR)/recvbuff$U.Po
+@AMDEP@include $(DEPDIR)/refnumtoa$U.Po
+@AMDEP@include $(DEPDIR)/statestr$U.Po
+@AMDEP@include $(DEPDIR)/strerror.Po
+@AMDEP@include $(DEPDIR)/syssignal$U.Po
+@AMDEP@include $(DEPDIR)/systime$U.Po
+@AMDEP@include $(DEPDIR)/tsftomsu$U.Po
+@AMDEP@include $(DEPDIR)/tstotv$U.Po
+@AMDEP@include $(DEPDIR)/tvtoa$U.Po
+@AMDEP@include $(DEPDIR)/tvtots$U.Po
+@AMDEP@include $(DEPDIR)/uglydate$U.Po
+@AMDEP@include $(DEPDIR)/uinttoa$U.Po
+@AMDEP@include $(DEPDIR)/utvtoa$U.Po
+@AMDEP@include $(DEPDIR)/ymd2yd$U.Po
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf $(DEPDIR)
+
+maintainer-clean-depend:
+
+@AMDEP@CCDEPMODE = @CCDEPMODE@
+
+.c.o:
+@AMDEP@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c -o $@ $<
 
 info-am:
 info: info-am
@@ -745,25 +556,28 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
+	-rm -f Makefile.in
 mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-kr mostlyclean-tags mostlyclean-generic
+		mostlyclean-kr mostlyclean-tags mostlyclean-depend \
+		mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-noinstLIBRARIES clean-compile clean-kr clean-tags \
-		clean-generic mostlyclean-am
+		clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-noinstLIBRARIES distclean-compile distclean-kr \
-		distclean-tags distclean-generic clean-am
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-kr \
-		maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
+		maintainer-clean-tags maintainer-clean-depend \
+		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -774,8 +588,9 @@ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \
 maintainer-clean-kr tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
+maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
+clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-exec-am install-exec \
 install-data-am install-data install-am install uninstall-am uninstall \
 all-redirect all-am all install-strip installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
diff --git a/contrib/ntp/libntp/audio.c b/contrib/ntp/libntp/audio.c
new file mode 100644
index 0000000..3228bba
--- /dev/null
+++ b/contrib/ntp/libntp/audio.c
@@ -0,0 +1,154 @@
+/*
+ * audio.c - audio interface for reference clock audio drivers
+ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "audio.h"
+#include <unistd.h>
+#include <stdio.h>
+
+#ifdef HAVE_SYS_AUDIOIO_H
+#include <sys/audioio.h>
+#endif /* HAVE_SYS_AUDIOIO_H */
+#ifdef HAVE_SUN_AUDIOIO_H
+#include <sun/audioio.h>
+#endif /* HAVE_SUN_AUDIOIO_H */
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif /* HAVE_SYS_IOCTL_H */
+
+#include <fcntl.h>
+
+/*
+ * Global variables
+ */
+#ifdef HAVE_SYS_AUDIOIO_H
+static struct audio_device device; /* audio device ident */
+static struct audio_info info;	/* audio device info */
+static int ctl_fd;		/* audio control file descriptor */
+#endif /* HAVE_SYS_AUDIOIO_H */
+
+
+/*
+ * audio_init - open and initialize audio device
+ *
+ * This code works with SunOS 4.x and Solaris 2.x; however, it is
+ * believed generic and applicable to other systems with a minor twid
+ * or two. All it does is open the device, set the buffer size (Solaris
+ * only), preset the gain and set the input port. It assumes that the
+ * codec sample rate (8000 Hz), precision (8 bits), number of channels
+ * (1) and encoding (ITU-T G.711 mu-law companded) have been set by
+ * default.
+ */
+int
+audio_init(void)
+{
+	int fd;
+#ifdef HAVE_SYS_AUDIOIO_H
+	int rval;
+#endif /* HAVE_SYS_AUDIOIO_H */
+
+	/*
+	 * Open audio device
+	 */
+	fd = open("/dev/audio", O_RDWR | O_NONBLOCK, 0777);
+	if (fd < 0) {
+		perror("audio:");
+		return (fd);
+	}
+
+#ifdef HAVE_SYS_AUDIOIO_H
+	/*
+	 * Open audio control device
+	 */
+	ctl_fd = open("/dev/audioctl", O_RDWR);
+	if (ctl_fd < 0) {
+		perror("audioctl:");
+		close(fd);
+		return(ctl_fd);
+	}
+
+	/*
+	 * Set audio device parameters.
+	 */
+	rval = audio_gain((AUDIO_MAX_GAIN - AUDIO_MIN_GAIN) / 2,
+	    AUDIO_MICROPHONE);
+	if (rval < 0) {
+		close(ctl_fd);
+		close(fd);
+		return(rval);
+	}
+#endif /* HAVE_SYS_AUDIOIO_H */
+	return (fd);
+}
+
+
+/*
+ * audio_gain - adjust codec gain and port
+ */
+int
+audio_gain(
+	int gain,		/* gain 0-255 */
+	int port		/* port */
+	)
+{
+#ifdef HAVE_SYS_AUDIOIO_H
+	int rval;
+#endif /* HAVE_SYS_AUDIOIO_H */
+
+#ifdef HAVE_SYS_AUDIOIO_H
+	AUDIO_INITINFO(&info);
+	info.record.buffer_size = AUDIO_BUFSIZ;
+	info.record.gain = gain;
+	info.record.port = port;
+	info.record.error = 0;
+	rval = ioctl(ctl_fd, (int)AUDIO_SETINFO, &info);
+	if (rval < 0) {
+		perror("audio:");
+		return (rval);
+	}
+	return (info.record.error);
+#else
+	return (0);
+#endif /* HAVE_SYS_AUDIOIO_H */
+}
+
+
+/*
+ * audio_show - display audio parameters
+ *
+ * This code doesn't really do anything, except satisfy curiousity and
+ * verify the ioctl's work.
+ */
+void
+audio_show(void)
+{
+#ifdef HAVE_SYS_AUDIOIO_H
+	ioctl(ctl_fd, (int)AUDIO_GETDEV, &device);
+	printf("audio: name %s, version %s, config %s\n",
+	    device.name, device.version, device.config);
+	ioctl(ctl_fd, (int)AUDIO_GETINFO, &info);
+	printf(
+	    "audio: samples %d, channels %d, precision %d, encoding %d\n",
+	    info.record.sample_rate, info.record.channels,
+	    info.record.precision, info.record.encoding);
+	printf("audio: gain %d, port %d, buffer %d\n",
+	    info.record.gain, info.record.port,
+	    info.record.buffer_size);
+	printf("audio: gain %d, port %d\n",
+	    info.record.gain, info.record.port);
+	printf(
+	    "audio: samples %d, eof %d, pause %d, error %d, waiting %d, balance %d\n",
+	    info.record.samples, info.record.eof,
+	    info.record.pause, info.record.error,
+	    info.record.waiting, info.record.balance);
+	printf("audio: monitor %d, muted %d\n",
+	    info.monitor_gain, info.output_muted);
+#endif /* HAVE_SYS_AUDIOIO_H */
+#ifdef __NetBSD__
+	printf("audio: monitor %d, blocksize %d, hiwat %d, lowat %d, mode %d\n",
+	    info.monitor_gain, info.blocksize, info.hiwat, info.lowat, info.mode);
+#endif /* __NetBSD__ */
+}
diff --git a/contrib/ntp/libntp/authkeys.c b/contrib/ntp/libntp/authkeys.c
index 39ca493..578688b 100644
--- a/contrib/ntp/libntp/authkeys.c
+++ b/contrib/ntp/libntp/authkeys.c
@@ -193,7 +193,7 @@ auth_moremem(void)
 	struct savekey *sk;
 	int i;
 
-	sk = (struct savekey *)malloc(MEMINC * sizeof(struct savekey));
+	sk = (struct savekey *)calloc(MEMINC, sizeof(struct savekey));
 	if (sk == 0)
 		return (0);
 	
diff --git a/contrib/ntp/libntp/clocktypes.c b/contrib/ntp/libntp/clocktypes.c
index c9a6766..520dce4 100644
--- a/contrib/ntp/libntp/clocktypes.c
+++ b/contrib/ntp/libntp/clocktypes.c
@@ -18,14 +18,14 @@ struct clktype clktypes[] = {
 	  "GPS_TRAK" },
 	{ REFCLK_WWV_PST,	"PSTI/Traconex WWV/WWVH Receiver (3)",
 	  "WWV_PST" },
-	{ REFCLK_WWVB_SPECTRACOM, "Spectracom WWVB Receiver (4)",
-	  "WWVB_SPEC" },
+	{ REFCLK_SPECTRACOM,	"Spectracom (generic) Receivers (4)",
+	  "SPECTRACOM" },
 	{ REFCLK_TRUETIME,	"TrueTime (generic) Receivers (5)",
 	  "TRUETIME" },
 	{ REFCLK_IRIG_AUDIO,	"IRIG Audio Decoder (6)",
 	  "IRIG_AUDIO" },
-	{ REFCLK_CHU,		"Scratchbuilt CHU Receiver (7)",
-	  "CHU" },
+	{ REFCLK_CHU_AUDIO,	"CHU Audio Demodulator/Decoder (7)",
+	  "CHU_AUDIO" },
 	{ REFCLK_PARSE,		"Generic reference clock driver (8)",
 	  "GENERIC" },
 	{ REFCLK_GPS_MX4200,	"Magnavox MX4200 GPS Receiver (9)",
@@ -76,10 +76,16 @@ struct clktype clktypes[] = {
 	  "GPS_JUPITER" },
 	{ REFCLK_CHRONOLOG,	"Chrono-log K (32)",
 	  "CHRONOLOG" },
-	{ REFCLK_DUMBCLOCK,	"Dumb generic hh:mm:ss local clock",
+	{ REFCLK_DUMBCLOCK,	"Dumb generic hh:mm:ss local clock (33)",
 	  "DUMBCLOCK" },
-	{ REFCLK_ULINK,         "Ultralink M320 WWVB receiver",
+	{ REFCLK_ULINK,         "Ultralink M320 WWVB receiver (34)",
 	  "ULINK_M320"},
+	{ REFCLK_PCF,		"Conrad parallel port radio clock (35)",
+	  "PCF"},
+	{ REFCLK_WWV_AUDIO,	"WWV/H Audio Demodulator/Decoder (36)",
+	  "WWV_AUDIO"},
+	{ REFCLK_FG,	"Forum Graphic GPS Dating Station (37)",
+	  "GPS_FG"},
 	{ -1,			"", "" }
 };
 
diff --git a/contrib/ntp/libntp/icom.c b/contrib/ntp/libntp/icom.c
new file mode 100644
index 0000000..4d6efc5
--- /dev/null
+++ b/contrib/ntp/libntp/icom.c
@@ -0,0 +1,329 @@
+/*
+ * Program to control ICOM radios
+ *
+ * This is a ripoff of the utility routines in the ICOM software
+ * distribution. The only function provided is to load the radio
+ * frequency. All other parameters must be manually set before use.
+ */
+#include "icom.h"
+#include <unistd.h>
+#include <stdio.h>
+
+#ifdef HAVE_TERMIOS_H
+# include <termios.h>
+#endif /* HAVE_TERMIOS_H */
+#ifdef HAVE_SYS_TERMIOS_H
+# include <sys/termios.h>
+#endif /* HAVE_SYS_TERMIOS_H */
+
+#include <fcntl.h>
+#include <errno.h>
+
+/*
+ * Scraps
+ */
+#define BMAX 50			/* max command length */
+#define DICOM /dev/icom/	/* ICOM port link */
+
+/*
+ * FSA definitions
+ */
+#define S_IDLE	0		/* idle */
+#define S_HDR	1		/* header */
+#define S_TX	2		/* address */
+#define S_DATA	3		/* data */
+#define S_ERROR	4		/* error */
+
+/*
+ * Local function prototypes
+ */
+static void doublefreq		P((double, u_char *, int));
+static int sndpkt		P((int, int, u_char *, u_char *));
+static int sndoctet		P((int, int));
+static int rcvoctet		P((int));
+
+/*
+ * Local variables
+ */
+static int flags;		/* trace flags */
+static int state;		/* fsa state */
+
+
+/*
+ * icom_freq(fd, ident, freq) - load radio frequency
+ */
+int
+icom_freq(			/* returns 0 (ok), EIO (error) */
+	int fd,			/* file descriptor */
+	int ident,		/* ICOM radio identifier */
+	double freq		/* frequency (MHz) */
+	)
+{
+	u_char cmd[BMAX], rsp[BMAX];
+	int temp;
+	cmd[0] = V_SFREQ;
+	if (ident == IC735)
+		temp = 4;
+	else
+		temp = 5;
+	doublefreq(freq * 1e6, &cmd[1], temp);
+	temp = sndpkt(fd, ident, cmd, rsp);
+	if (temp < 1 || rsp[0] != ACK)
+		return (EIO);
+	return (0);
+}
+
+
+/*
+ * doublefreq(freq, y, len) - double to ICOM frequency with padding
+ */
+static void
+doublefreq(			/* returns void */
+	double freq,		/* frequency */
+	u_char *x,		/* radio frequency */
+	int len			/* length (octets) */
+	)
+{
+	int i;
+	char s1[11];
+	char *y;
+
+	sprintf(s1, " %10.0f", freq);
+	y = s1 + 10;
+	i = 0;
+	while (*y != ' ') {
+		x[i] = *y-- & 0x0f;
+		x[i] = x[i] | ((*y-- & 0x0f) << 4);
+		i++;
+	}
+	for (; i < len; i++)
+		x[i] = 0;
+	x[i] = FI;
+}
+
+
+/*
+ * Packet routines
+ *
+ * These routines send a packet and receive the response. If an error
+ * (collision) occurs on transmit, the packet is resent. If an error
+ * occurs on receive (timeout), all input to the terminating FI is
+ * discarded and the packet is resent. If the maximum number of retries
+ * is not exceeded, the program returns the number of octets in the user
+ * buffer; otherwise, it returns zero.
+ *
+ * ICOM frame format
+ *
+ * Frames begin with a two-octet preamble PR-PR followyd by the
+ * transceiver address RE, controller address TX, control code CN, zero
+ * or more data octets DA (depending on command), and terminator FI.
+ * Since the bus is bidirectional, every octet output is echoed on
+ * input. Every valid frame sent is answered with a frame in the same
+ * format, but with the RE and TX fields interchanged. The CN field is
+ * set to NAK if an error has occurred. Otherwise, the data are returned
+ * in this and following DA octets. If no data are returned, the CN
+ * octet is set to ACK.
+ *
+ *	+------+------+------+------+------+--//--+------+
+ *	|  PR  |  PR  |  RE  |  TX  |  CN  |  DA  |  FI  |
+ *	+------+------+------+------+------+--//--+------+
+ */
+/*
+ * icom_open() - open and initialize serial interface
+ *
+ * This routine opens the serial interface for raw transmission; that
+ * is, character-at-a-time, no stripping, checking or monkeying with the
+ * bits. For Unix, an input operation ends either with the receipt of a
+ * character or a 0.5-s timeout.
+ */
+int
+icom_init(
+	char *device,		/* device name/link */
+	int speed,		/* line speed */
+	int trace		/* trace flags */	)
+{
+	struct termios ttyb;
+	int fd;
+
+	flags = trace;
+	fd = open(device, O_RDWR, 0777);
+	if (fd < 0)
+		return (fd);
+	tcgetattr(fd, &ttyb);
+	ttyb.c_iflag = 0;	/* input modes */
+	ttyb.c_oflag = 0;	/* output modes */
+	ttyb.c_cflag = IBAUD|CS8|CREAD|CLOCAL;	/* control modes */
+	ttyb.c_lflag = 0;	/* local modes */
+	ttyb.c_cc[VMIN] = 0;	/* min chars */
+	ttyb.c_cc[VTIME] = 5;	/* receive timeout */
+	cfsetispeed(&ttyb, (u_int)speed);
+	cfsetospeed(&ttyb, (u_int)speed);
+	tcsetattr(fd, TCSANOW, &ttyb);
+	return (fd);
+}
+
+
+/*
+ * sndpkt(r, x, y) - send packet and receive response
+ *
+ * This routine sends a command frame, which consists of all except the
+ * preamble octets PR-PR. It then listens for the response frame and
+ * returns the payload to the caller. The routine checks for correct
+ * response header format; that is, the length of the response vector
+ * returned to the caller must be at least 2 and the RE and TX octets
+ * must be interchanged; otherwise, the operation is retried up to
+ * the number of times specified in a global variable.
+ *
+ * The trace function, which is enabled by the P_TRACE bit of the global
+ * flags variable, prints all characters received or echoed on the bus
+ * preceded by a T (transmit) or R (receive). The P_ERMSG bit of the
+ * flags variable enables printing of bus error messages.
+ *
+ * Note that the first octet sent is a PAD in order to allow time for
+ * the radio to flush its receive buffer after sending the previous
+ * response. Even with this precaution, some of the older radios
+ * occasionally fail to receive a command and it has to be sent again.
+ */
+static int
+sndpkt(				/* returns octet count */
+	int fd,			/* file descriptor */
+	int r,			/* radio address */
+	u_char *cmd,		/* command vector */
+	u_char *rsp		/* response vector */
+	)
+{
+	int i, j, temp;
+
+	(void)tcflush(fd, TCIOFLUSH);
+	for (i = 0; i < RETRY; i++) {
+		state = S_IDLE;
+
+		/*
+		 * Transmit packet.
+		 */
+		if (flags & P_TRACE)
+			printf("icom T:");
+		sndoctet(fd, PAD);	/* send header */
+		sndoctet(fd, PR);
+		sndoctet(fd, PR);
+		sndoctet(fd, r);
+		sndoctet(fd, TX);
+		for (j = 0; j < BMAX; j++) { /* send body */
+			if (sndoctet(fd, cmd[j]) == FI)
+				break;
+		}
+		while (rcvoctet(fd) != FI); /* purge echos */
+		if (cmd[0] == V_FREQT || cmd[0] == V_MODET)
+			return (0);	/* shortcut for broadcast */
+
+		/*
+		 * Receive packet. First, delete all characters
+		 * preceeding a PR, then discard all PRs. Check that the
+		 * RE and TX fields are correctly interchanged, then
+		 * copy the remaining data and FI to the user buffer.
+		 */
+		if (flags & P_TRACE)
+			printf("\nicom R:");
+		j = 0;
+		while ((temp = rcvoctet(fd)) != FI) {
+			switch (state) {
+
+			case S_IDLE:
+				if (temp != PR)
+					continue;
+				state = S_HDR;
+				break;
+
+			case S_HDR:
+				if (temp == PR) {
+					continue;
+				} else if (temp != TX) {
+					if (flags & P_ERMSG)
+						printf(
+						    "icom: TX error\n");
+					state = S_ERROR;
+				}
+				state = S_TX;
+				break;
+
+			case S_TX:
+				if (temp != r) {
+					if (flags & P_ERMSG)
+						printf(
+						    "icom: RE error\n");
+					state = S_ERROR;
+				}
+				state = S_DATA;
+				break;
+
+			case S_DATA:
+				if (j >= BMAX ) {
+					if (flags & P_ERMSG)
+						printf(
+					    "icom: buffer overrun\n");
+					state = S_ERROR;
+					j = 0;
+				}
+				rsp[j++] = (u_char)temp;
+				break;
+
+			case S_ERROR:
+				break;
+			}
+		}
+		if (flags & P_TRACE)
+			printf("\n");
+		if (j > 0) {
+			rsp[j++] = FI;
+			return (j);
+		}
+	}
+	if (flags & P_ERMSG)
+		printf("icom: retries exceeded\n");
+	return (0);
+}
+
+
+/*
+ * Interface routines
+ *
+ * These routines read and write octets on the bus. In case of receive
+ * timeout a FI code is returned. In case of output collision (echo
+ * does not match octet sent), the remainder of the collision frame
+ * (including the trailing FI) is discarded.
+ */
+/*
+ * sndoctet(fd, x) - send octet
+ */
+static int
+sndoctet(			/* returns octet */
+	int fd,			/* file descriptor */
+	int x			/* octet */
+	)
+{
+	u_char y;
+
+	y = (u_char)x;
+	write(fd, &y, 1);
+	return (x);
+}
+
+
+/*
+ * rcvoctet(fd) - receive octet
+ */
+static int
+rcvoctet(			/* returns octet */
+	int fd			/* file descriptor */
+	)
+{
+	u_char y;
+
+	if (read(fd, &y, 1) < 1)
+		y = FI;		/* come here if timeout */
+	if (flags & P_TRACE && y != PAD)
+		printf(" %02x", y);
+	return (y);
+}
+
+/* end program */
diff --git a/contrib/ntp/libntp/recvbuff.c b/contrib/ntp/libntp/recvbuff.c
index 37166a4..96d212d 100644
--- a/contrib/ntp/libntp/recvbuff.c
+++ b/contrib/ntp/libntp/recvbuff.c
@@ -24,7 +24,6 @@ static	struct recvbuf *volatile fulllist;  /* lifo buffers with data */
 static	struct recvbuf *volatile beginlist; /* fifo buffers with data */
 	
 #if defined(HAVE_IO_COMPLETION_PORT)
-static HANDLE fulldatabufferevent;
 static CRITICAL_SECTION RecvCritSection;
 # define RECV_BLOCK_IO()	EnterCriticalSection(&RecvCritSection)
 # define RECV_UNBLOCK_IO()	LeaveCriticalSection(&RecvCritSection)
@@ -116,22 +115,10 @@ init_recvbuff(int nbufs)
 
 #if defined(HAVE_IO_COMPLETION_PORT)
 	InitializeCriticalSection(&RecvCritSection);
-	fulldatabufferevent = CreateEvent(NULL, FALSE,FALSE, NULL);
 #endif
 
 }
 
-#if defined(HAVE_IO_COMPLETION_PORT)
-
-/*  Return the new full buffer event handle . This handle is 
- *  signalled when a recv buffer is placed in the full list.
- */
-HANDLE
-get_recv_buff_event()
-{
-	return fulldatabufferevent;
-}
-#endif
 
 /*
  * getrecvbufs - get receive buffers which have data in them
@@ -224,11 +211,6 @@ add_full_recv_buffer(
 	fulllist = rb;
 	full_recvbufs++;
 
-#if defined(HAVE_IO_COMPLETION_PORT)
-	if (!SetEvent(fulldatabufferevent)) {
-		msyslog(LOG_ERR, "Can't set receive buffer event");
-	}
-#endif
 	RECV_UNBLOCK_IO();
 }
 
diff --git a/contrib/ntp/libntp/syssignal.c b/contrib/ntp/libntp/syssignal.c
index 50c65b7..6ec4c4c 100644
--- a/contrib/ntp/libntp/syssignal.c
+++ b/contrib/ntp/libntp/syssignal.c
@@ -41,6 +41,16 @@ signal_no_reset(
 	vec.sa_flags = 0;
 #endif
 
+#ifdef SA_RESTART
+/* Added for PPS clocks on Solaris 7 which get EINTR errors */
+# ifdef SIGPOLL
+	if (sig == SIGPOLL) vec.sa_flags = SA_RESTART;
+# endif
+# ifdef SIGIO
+	if (sig == SIGIO)   vec.sa_flags = SA_RESTART;
+# endif
+#endif
+
 	while (1)
 	{
 		struct sigaction ovec;
diff --git a/contrib/ntp/libntp/systime.c b/contrib/ntp/libntp/systime.c
index 5e50fc5..2ef6ef9 100644
--- a/contrib/ntp/libntp/systime.c
+++ b/contrib/ntp/libntp/systime.c
@@ -25,12 +25,6 @@
 #include "ntp_unixtime.h"
 #include "ntp_stdlib.h"
 
-#if defined SYS_WINNT
-#include "ntp_timer.h"
-extern DWORD units_per_tick;
-static long last_Adj = 0;
-#endif
-
 int	systime_10ms_ticks = 0;	/* adj sysclock in 10ms increments */
 
 #define MAXFREQ 500e-6
@@ -80,6 +74,7 @@ get_systime(
 	(void) GETTIMEOFDAY(&tv, (struct timezone *)0);
 	now->l_i = tv.tv_sec + JAN_1970;
 
+#if defined RELIANTUNIX_CLOCK || defined SCO5_CLOCK
 	if (systime_10ms_ticks) {
 		/* fake better than 10ms resolution by interpolating 
 	   	accumulated residual (in adj_systime(), see below) */
@@ -92,9 +87,10 @@ get_systime(
 			}
 		}
 		dtemp *= FRAC;
-	} else {
-		dtemp = tv.tv_usec * FRAC / 1e6;
-	}
+	} else
+#endif
+
+	dtemp = tv.tv_usec * FRAC / 1e6;
 
 	if (dtemp >= FRAC)
 		now->l_i++;
@@ -108,6 +104,7 @@ get_systime(
  * adj_systime - called once every second to make system time adjustments.
  * Returns 1 if okay, 0 if trouble.
  */
+#if !defined SYS_WINNT
 int
 adj_systime(
 	double now
@@ -116,12 +113,7 @@ adj_systime(
 	double dtemp;
 	struct timeval adjtv;
 	u_char isneg = 0;
-#if !defined SYS_WINNT && !defined SYS_CYGWIN32
 	struct timeval oadjtv;
-#else
-	int rc;
-   long dwTimeAdjustment;
-#endif
 
 	/*
 	 * Add the residual from the previous adjustment to the new
@@ -134,6 +126,7 @@ adj_systime(
 		dtemp = -dtemp;
 	}
 
+#if defined RELIANTUNIX_CLOCK || defined SCO5_CLOCK
 	if (systime_10ms_ticks) {
 		/* accumulate changes until we have enough to adjust a tick */
 		if (dtemp < 5000e-6) {
@@ -145,43 +138,18 @@ adj_systime(
 			else sys_residual = dtemp - 10000e-6;
 			dtemp = 10000e-6;
 		}
-	} else {
+	} else 
+#endif
 		if (dtemp > sys_maxfreq)
 			dtemp = sys_maxfreq;
-	}
 
-#ifdef SYS_WINNT
-	dtemp = dtemp * 1000000.0;
-#else
 	dtemp = dtemp * 1e6 + .5;
-#endif
+
 	if (isneg)
 		dtemp = -dtemp;
 	adjtv.tv_sec = 0;
 	adjtv.tv_usec = (int32)dtemp;
 
-#if defined SYS_WINNT || defined SYS_CYGWIN32	
-	/* dtemp is in micro seconds. NT uses 100 ns units,
-	 * so a unit change in dwTimeAdjustment corresponds
-	 * to slewing 10 ppm. 
-	 * Calculate the number of 100ns units to add, 
-	 * and leave the remainder in dtemp */
-	dwTimeAdjustment = dtemp / 10;
-	dtemp +=  (double) -dwTimeAdjustment * 10.0;	
-	dwTimeAdjustment += units_per_tick;
-
-	/* only adjust the clock if adjustment changes */
-	if (last_Adj != dwTimeAdjustment) { 	
-			last_Adj = dwTimeAdjustment;  
-# ifdef DEBUG
-		if (debug > 1) 
-			printf("SetSystemTimeAdjustment( %ld)\n", dwTimeAdjustment);			
-# endif
-			rc = !SetSystemTimeAdjustment(dwTimeAdjustment, FALSE);
-	}
-	else rc = 0;
-	if (rc)
-#else
 	/*
 	 * Here we do the actual adjustment. If for some reason the adjtime()
 	 * call fails, like it is not implemented or something like that,
@@ -190,17 +158,12 @@ adj_systime(
 	 */
 	/* casey - we need a posix type thang here */
 	if (adjtime(&adjtv, &oadjtv) < 0)
-#endif /* SYS_WINNT */
 	{
 		msyslog(LOG_ERR, "Can't adjust time: %m");
 		return 0;
 	} 
 	else {
-#if !defined (SYS_WINNT) && !defined (SYS_CYGWIN32)
 	sys_residual += oadjtv.tv_usec / 1e6;
-#else
-	sys_residual = dtemp / 1000000.0;
-#endif /* SYS_WINNT */
 	}
 #ifdef DEBUG
 	if (debug > 6)
@@ -208,6 +171,7 @@ adj_systime(
 #endif
 	return 1;
 }
+#endif
 
 
 /*