Merge

bk: 3e9e83b3NVOHIamYFu8OFR3cYqB87g

diff --cc Makefile.am
Simple merge

diff --cc NEWS
Simple merge

diff --cc ntpd/Makefile.am
index aefab5d03bb2639905bfbe79142aeb0a3a884d1d,e0f6236d24287918a2c4a070285eae3c13ca31b4..448b07b2d2159b6b1229e58c2adc4861a285a6e7
--- 1/ntpd/Makefile.am
--- 2/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@@ -55,6 -47,6 +55,6 @@@ $(PROGRAMS): $(LDADD
  ../libparse/libparse.a:
        cd ../libparse && $(MAKE)
  
- version.o: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ Makefile
 -version.o: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ @LIBRSAREF@ Makefile $(top_srcdir)/version
++version.o: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ Makefile $(top_srcdir)/version
        env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpd
        $(COMPILE) -c version.c

diff --cc ntpdate/Makefile.am
index 508f9d68b000260636e36ace719e274b4f2f6e09,12c4c312cf655b172f6bf8f0316b456dafdebdb8..bfe3fea664c5eae3323fc84b70326073d2fffa41
--- 1/ntpdate/Makefile.am
--- 2/ntpdate/Makefile.am
+++ b/ntpdate/Makefile.am
@@@ -17,6 -15,6 +17,6 @@@ $(PROGRAMS): $(LDADD
  ../libntp/libntp.a:
        cd ../libntp && $(MAKE)
  
- version.o: $(ntpdate_OBJECTS) ../libntp/libntp.a Makefile
 -version.o: $(ntpdate_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile $(top_srcdir)/version
++version.o: $(ntpdate_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/version
        env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpdate
        $(COMPILE) -c version.c

diff --cc ntpdc/Makefile.am
index cb0171898e8e5626046dff260631805aadac9022,94b8e9e215d12ba4b98e0c698ca3320c680dad36..538a3ef3b303cbc3c9da49e22170e9d99389ba4d
--- 1/ntpdc/Makefile.am
--- 2/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@@ -16,6 -16,6 +16,6 @@@ $(PROGRAMS): $(LDADD
  ../libntp/libntp.a:
        cd ../libntp && $(MAKE)
  
- version.o: $(ntpdc_OBJECTS) ../libntp/libntp.a Makefile
 -version.o: $(ntpdc_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile $(top_srcdir)/version
++version.o: $(ntpdc_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/version
        env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpdc
        $(COMPILE) -c version.c

diff --cc ntpq/Makefile.am
index 7b0fdd93921cdfa306c4998235aa8cec4ae7bbb4,1b25de3135b27b686f48318232c064a1cb75a04e..8bd6a5cf6083af1f3a14a1613e96ceeb4cae2976
--- 1/ntpq/Makefile.am
--- 2/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@@ -16,6 -16,6 +16,6 @@@ $(PROGRAMS): $(LDADD
  ../libntp/libntp.a:
        cd ../libntp && $(MAKE)
  
- version.o: $(ntpq_OBJECTS) ../libntp/libntp.a Makefile
 -version.o: $(ntpq_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile $(top_srcdir)/version
++version.o: $(ntpq_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/version
        env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpq
        $(COMPILE) -c version.c