From: Dave Hart <hart@ntp.org>
Date: Mon, 13 Mar 2023 08:50:22 +0000 (+0000)
Subject: Use silent rules for version.c files.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76b98f981af7c15cc87375179e1a5552b32df3fd;p=thirdparty%2Fntp.git

Use silent rules for version.c files.
Correct configure.ac test and bump cache version to flush bad results.
Silence gcc format-truncation warning in refclock_leitch.c.

bk: 640ee3ceL_BmcdF25-OgmN5ARDl0SA
---

diff --git a/configure.ac b/configure.ac
index c01b0cb52..8e94a9551 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ AC_PRESERVE_HELP_ORDER
 # the date YYYYMMDD optionally with -HHMM if there is more than one
 # bump in a day.
 
-ntp_configure_cache_version=20120806
+ntp_configure_cache_version=20230313
 
 # When the cache version of config.cache and configure do not
 # match, NTP_CACHEVERSION will flush the cache.
@@ -475,7 +475,7 @@ case "$have_adjtimex" in
 			struct nlist n;
 			n.n_un.n_name = 0;
 		    ]]
-		)]
+		)],
 		[ntp_cv_struct_nlist_n_un=yes],
 		[ntp_cv_struct_nlist_n_un=no]
 	    )]
diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 42ad789c1..9eeb971ac 100644
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -478,9 +478,6 @@ $(top_srcdir)/sntp/scm-rev:
 version.c: $(ntpd_OBJECTS) ../libntp/libntp.a @LIBPARSE@ Makefile $(top_srcdir)/sntp/scm-rev
 	env CSET=`cat $(top_srcdir)/sntp/scm-rev` $(top_builddir)/scripts/build/mkver ntpd
 
-version.o: version.c
-	env CCACHE_DISABLE=1 $(COMPILE) -c version.c -o version.o
-
 $(srcdir)/Makefile.am:
 	@: do-nothing
 
diff --git a/ntpd/refclock_leitch.c b/ntpd/refclock_leitch.c
index 69ffdc5ed..4ed6902dd 100644
--- a/ntpd/refclock_leitch.c
+++ b/ntpd/refclock_leitch.c
@@ -242,7 +242,7 @@ leitch_start(
 {
 	struct leitchunit *leitch;
 	int fd232;
-	char leitchdev[20];
+	char leitchdev[32];
 
 	/*
 	 * Check configuration info.
diff --git a/ntpdate/Makefile.am b/ntpdate/Makefile.am
index 8c08cf6d7..80b59d9e4 100644
--- a/ntpdate/Makefile.am
+++ b/ntpdate/Makefile.am
@@ -34,9 +34,6 @@ $(top_srcdir)/sntp/scm-rev:
 version.c: $(ntpdate_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/sntp/scm-rev
 	env CSET=`cat $(top_srcdir)/sntp/scm-rev` $(top_builddir)/scripts/build/mkver ntpdate
 	
-version.o: version.c
-	env CCACHE_DISABLE=1 $(COMPILE) -c version.c -o version.o
-
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/check-libntp.mf
 include $(top_srcdir)/depsver.mf
diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index f56138b86..8fe96a8a5 100644
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -139,9 +139,6 @@ $(top_srcdir)/sntp/scm-rev:
 version.c: $(ntpdc_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/sntp/scm-rev
 	env CSET=`cat $(top_srcdir)/sntp/scm-rev` $(top_builddir)/scripts/build/mkver ntpdc
 	
-version.o: version.c
-	env CCACHE_DISABLE=1 $(COMPILE) -c version.c -o version.o
-
 # I ran nl_in.c (attached, to be installed into ntpdc) through
 # $(CC) -E nl_in.c | nl.pl > nl.c
 nl.c: nl_in.c nl.pl Makefile.am ../config.h ../include/ntp_request.h ntpdc.h
diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 3d7956b87..d666aab82 100644
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -130,9 +130,6 @@ $(top_srcdir)/sntp/scm-rev:
 version.c: $(ntpq_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/sntp/scm-rev
 	env CSET=`cat $(top_srcdir)/sntp/scm-rev` $(top_builddir)/scripts/build/mkver ntpq
 
-version.o: version.c
-	env CCACHE_DISABLE=1 $(COMPILE) -c version.c -o version.o
-
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/check-libopts.mf
 include $(top_srcdir)/check-libntp.mf
diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 7deca5a0f..7b4b4900b 100644
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -166,9 +166,6 @@ $(PROGRAMS): version.o
 version.c: $(sntp_OBJECTS) ../libntp/libntp.a Makefile $(srcdir)/scm-rev
 	env CSET=`cat $(srcdir)/scm-rev` $(top_builddir)/../scripts/build/mkver sntp
 
-version.o: version.c
-	env CCACHE_DISABLE=1 $(COMPILE) -c version.c -o version.o
-
 check-autogen-version.def: FRC
 	@cd $(srcdir)							\
 	&& test -r ../include/autogen-version.def			\
diff --git a/util/Makefile.am b/util/Makefile.am
index 939ce6be6..ffc039292 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -129,9 +129,6 @@ $(top_srcdir)/sntp/scm-rev:
 version.c: $(ntp_keygen_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/sntp/scm-rev
 	env CSET=`cat $(top_srcdir)/sntp/scm-rev` $(top_builddir)/scripts/build/mkver ntp-keygen
 
-version.o: version.c
-	env CCACHE_DISABLE=1 $(COMPILE) -c version.c -o version.o
-
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/check-libntp.mf
 include $(top_srcdir)/check-libopts.mf