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 c01b0cb52d4f7a27c79d86d975cb0577b63f9775..8e94a955195fc68815b6acb1e5293a4d78c2cf80 100644 (file)
--- 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 42ad789c1a5161b45e23dce30552047b10d9de64..9eeb971ac4ef081c59f6458d980e0ac681146ec3 100644 (file)
--- 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 69ffdc5ed564c8d4d9a6d7888ecda082712a70d8..4ed6902dd1be12a00224bee9db28981219c9d160 100644 (file)
--- 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 8c08cf6d72043b5a6cc45e4cec120120d03e7464..80b59d9e43eb947bdff9bed2b4b73acd4c9a5915 100644 (file)
--- 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 f56138b86d030b251e713095b5b0f69394de2a30..8fe96a8a5b8749358241c634779d79d2423da90e 100644 (file)
--- 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 3d7956b87c0a9dc1cc51214c3441d2e64d1e629d..d666aab82ab98d8b9ad197c2d2db649178974666 100644 (file)
--- 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 7deca5a0fede29f9aff19432c676cae10ae6bec4..7b4b4900b537bd5b93bb1110ecd09fe59a1c86a5 100644 (file)
--- 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 939ce6be6896c98e835612c190c4dcdb21aa187d..ffc03929262a3c430573964011c9c138c1f4a854 100644 (file)
--- 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