[Bug 3852] check-libntp.mf and friends are not triggering rebuilds as

           intended.

bk: 64c77f54pR4ltDOuWFNDKprfau-_zQ

diff --git a/ChangeLog b/ChangeLog
index 4e4344acce66da66dcc572a9408dc65553cefd8b..dd1cdb3f575cf4eced4aae74134d32cc9772e5a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 ---
 
+* [Bug 3852] check-libntp.mf and friends are not triggering rebuilds as
+             intended. <hart@ntp.org>
 * [Bug 3851] Drop pool server when no local address can reach it.
              <hart@ntp.org>
 * [Bug 3850] ntpq -c apeers breaks column formatting s2 w/refclock refid.

diff --git a/check-libntp.mf b/check-libntp.mf
index 07c855b4be78780d40032fc23988c72b8399d717..ba3b12570eff897627a1e7a3fa3286f76c7374ee 100644 (file)
--- a/check-libntp.mf
+++ b/check-libntp.mf
@@ -4,11 +4,8 @@
 ## The above file has a version of this for the sntp tree.
 
 BUILT_SOURCES  += check-libntp
-CLEANFILES     += check-libntp
 
-check-libntp: $(top_builddir)/libntp/libntp.a
-       @: avoid default SCCS get by some make implementations
-
-$(top_builddir)/libntp/libntp.a:
+.PHONY: check-libntp
+check-libntp:
        cd $(top_builddir)/libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
 

diff --git a/check-libntpd.mf b/check-libntpd.mf
index 46304dd5f236e3652eabccdb9e1f78c24c17ef15..45133ad52c1c4471f4b5b2cadca32404ae4a5fa3 100644 (file)
--- a/check-libntpd.mf
+++ b/check-libntpd.mf
@@ -4,16 +4,7 @@
 
 BUILT_SOURCES  += check-libntpd
 
-# CLEANFILES addition below won't be needed after a while.
-# Leave it in for now for folks tracking the source repo
-# who have the file from a former version of the rule.
-# DLH Jan 2023
-
-CLEANFILES     += check-libntpd
-
-check-libntpd: $(top_builddir)/ntpd/libntpd.a
-        @: avoid default SCCS get by some make implementations
-
-$(top_builddir)/ntpd/libntpd.a:
+.PHONY: check-libntpd
+check-libntpd:
        cd $(top_builddir)/ntpd && $(MAKE) $(AM_MAKEFLAGS) libntpd.a
 

diff --git a/check-libunity.mf b/check-libunity.mf
index 4e052058c0c321176f3c4e38d2bc85f3edc3931f..830c72c1a421307b0b64c2b1f00deaa62bc9a7d6 100644 (file)
--- a/check-libunity.mf
+++ b/check-libunity.mf
@@ -4,10 +4,10 @@
 ## The above file has a version of this for the sntp tree.
 
 BUILT_SOURCES  += check-libunity
+CLEANFILES     += check-libunity
 
 check-libunity: $(top_builddir)/sntp/unity/libunity.a
-        @: avoid default SCCS get by some make implementations
+       @echo stamp > $@
 
 $(top_builddir)/sntp/unity/libunity.a:
        cd $(top_builddir)/sntp/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
-

diff --git a/check-scm-rev.mf b/check-scm-rev.mf
index e2abbf0e452c778dcbe9481e941e4373b61ff923..7c0d1be2892f49121be226bd952c01533ca61261 100644 (file)
--- a/check-scm-rev.mf
+++ b/check-scm-rev.mf
@@ -1,8 +1,6 @@
 $(top_srcdir)/sntp/scm-rev: FRC.scm-rev
        $(AM_V_GEN)cd $(top_builddir)/sntp && $(MAKE) $(AM_MAKEFLAGS) check-scm-rev
 
+.PHONY: FRC.scm-rev
 FRC.scm-rev:
-       @: FRC.scm-rev "force" depends on nothing and is not a file, so is      \
-          always out-of-date causing targets which depend on it to also                \
-          be outdated so their rules to fire each time they are built.
-
+       @: FRC.scm-rev is always out of date, triggering the check every make invocation.

diff --git a/sntp/check-libntp.mf b/sntp/check-libntp.mf
index 649f605a8d07cb420d788cf26ed3f8f46672094d..c4741ce72525e24e3686b4a238e758465c064aad 100644 (file)
--- a/sntp/check-libntp.mf
+++ b/sntp/check-libntp.mf
@@ -5,11 +5,7 @@
 ## of the NTP package.
 
 BUILT_SOURCES  += check-libntp
-CLEANFILES     += check-libntp
 
-check-libntp: $(top_builddir)/../libntp/libntp.a
-       @: avoid default SCCS get by some make implementations
-
-$(top_builddir)/../libntp/libntp.a:
+.PHONY: check-libntp
+check-libntp:
        cd $(top_builddir)/../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
-

diff --git a/sntp/check-libsntp.mf b/sntp/check-libsntp.mf
index d05a3d02fd0748380fda3990a234f3aeab9d0613..297a8947a57e75c6838950734c4b607d42351786 100644 (file)
--- a/sntp/check-libsntp.mf
+++ b/sntp/check-libsntp.mf
@@ -3,11 +3,7 @@
 ##
 
 BUILT_SOURCES  += check-libsntp
-CLEANFILES     += check-libsntp
 
-check-libsntp: $(top_builddir)/sntp/libsntp.a
-       @: avoid default SCCS get by some make implementations
-
-$(top_builddir)/sntp/libsntp.a:
+.PHONY: check-libsntp
+check-libsntp:
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) libsntp.a
-

diff --git a/sntp/check-libunity.mf b/sntp/check-libunity.mf
index bf5ec3bde1ed237aeb4240b1ee01e69646d2c027..af394da6e504cb8668fb0897aa1d649e548ba2f5 100644 (file)
--- a/sntp/check-libunity.mf
+++ b/sntp/check-libunity.mf
@@ -8,8 +8,7 @@ BUILT_SOURCES   += check-libunity
 CLEANFILES     += check-libunity
 
 check-libunity: $(top_builddir)/unity/libunity.a
-        @: avoid default SCCS get by some make implementations
+       @echo stamp > $@
 
 $(top_builddir)/unity/libunity.a:
        cd $(top_builddir)/unity && $(MAKE) $(AM_MAKEFLAGS) libunity.a
-