From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 17 Apr 2003 10:31:00 +0000 (-0400)
Subject: version -> version.c improvements
X-Git-Tag: NTP_4_1_1C_RC2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bde73354c1553f86ed410b75012ebf31b493f4ea;p=thirdparty%2Fntp.git

version -> version.c improvements

bk: 3e9e8264ejeWDfUWdaLM_9uIN8jpWQ
---

diff --git a/Makefile.am b/Makefile.am
index 8bbe0b837..2df68899f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,12 +68,13 @@ $(srcdir)/COPYRIGHT: html/copyright.htm
 # repo is not a bk repo, we'll get an error message from the prs command.
 # Unfortunately, I haven't found the necessary magic to redirect this error
 # output to /dev/null under ancient/unique shells like the one Ultrix uses.
-# We'll also get an error of srcdir or version is unwritable.
+# We'll also get an error if srcdir or version is unwritable.
 $(srcdir)/version: FRC.version
 	-(bk version) >/dev/null 2>&1 && \
 	    cd $(srcdir) && \
             x=`bk -R prs -hr+ -nd:I: ChangeSet` && \
-	    case "$$x" in '') ;; *) echo $$x > version ;; esac
+	    y=`cat version 2>/dev/null` || true && \
+	    case "$$x" in ''|$$y) ;; *) echo $$x > version ;; esac
 
 dist-hook:
 	@find $(distdir) -type d -name CVS -print | xargs rm -rf
diff --git a/NEWS b/NEWS
index 019c9c3ce..4216551b7 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@
 * ntpdc improvements
 * GOES refclock fix
 * JJY driver
+* AIX 5 port
 * bsdi port fixes
 * Cray unicos port upgrade
 * HP MPE/iX port
diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 94dfd092a..e0f6236d2 100644
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -47,6 +47,6 @@ $(PROGRAMS): $(LDADD)
 ../libparse/libparse.a:
 	cd ../libparse && $(MAKE)
 
-version.o: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ @LIBRSAREF@ Makefile
+version.o: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ @LIBRSAREF@ Makefile $(top_srcdir)/version
 	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpd
 	$(COMPILE) -c version.c
diff --git a/ntpdate/Makefile.am b/ntpdate/Makefile.am
index f4152b012..12c4c312c 100644
--- a/ntpdate/Makefile.am
+++ b/ntpdate/Makefile.am
@@ -15,6 +15,6 @@ $(PROGRAMS): $(LDADD)
 ../libntp/libntp.a:
 	cd ../libntp && $(MAKE)
 
-version.o: $(ntpdate_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile
+version.o: $(ntpdate_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile $(top_srcdir)/version
 	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpdate
 	$(COMPILE) -c version.c
diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index ba0626f3a..94b8e9e21 100644
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -16,6 +16,6 @@ $(PROGRAMS): $(LDADD)
 ../libntp/libntp.a:
 	cd ../libntp && $(MAKE)
 
-version.o: $(ntpdc_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile
+version.o: $(ntpdc_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile $(top_srcdir)/version
 	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpdc
 	$(COMPILE) -c version.c
diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 918df9c8e..1b25de313 100644
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -16,6 +16,6 @@ $(PROGRAMS): $(LDADD)
 ../libntp/libntp.a:
 	cd ../libntp && $(MAKE)
 
-version.o: $(ntpq_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile
+version.o: $(ntpq_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile $(top_srcdir)/version
 	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntpq
 	$(COMPILE) -c version.c
diff --git a/ntptrace/Makefile.am b/ntptrace/Makefile.am
index fed832199..419c3eb98 100644
--- a/ntptrace/Makefile.am
+++ b/ntptrace/Makefile.am
@@ -14,6 +14,6 @@ $(PROGRAMS): $(LDADD)
 ../libntp/libntp.a:
 	cd ../libntp && $(MAKE)
 
-version.o: $(ntptrace_OBJECTS) ../libntp/libntp.a Makefile
+version.o: $(ntptrace_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/version
 	env CSET=`cat $(top_srcdir)/version` $(top_builddir)/scripts/mkver ntptrace
 	$(COMPILE) -c version.c