From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 17 Apr 2003 10:36:35 +0000 (-0400)
Subject: Merge
X-Git-Tag: NTP_4_1_80_RC1~43^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82fa00ace59b1224fc8185c8b5e694870bb60fc8;p=thirdparty%2Fntp.git

Merge

bk: 3e9e83b3NVOHIamYFu8OFR3cYqB87g
---

82fa00ace59b1224fc8185c8b5e694870bb60fc8
diff --cc ntpd/Makefile.am
index aefab5d03,e0f6236d2..448b07b2d
--- a/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 508f9d68b,12c4c312c..bfe3fea66
--- a/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 cb0171898,94b8e9e21..538a3ef3b
--- a/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 7b0fdd939,1b25de313..8bd6a5cf6
--- a/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