Fix build break triggered by updating deps-ver and libntp/systime.c at

  the same time by explicitly depending systime_s.c on systime.c.

bk: 4f077639ImZFuz7MC0bKA2Ro1F1Lag

diff --git a/ChangeLog b/ChangeLog
index a5b689c1bc8ca7955f5b21542407c19b68195866..61c4ba12172cc4aa444b8575d414fadefb5d84e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+* Fix build break triggered by updating deps-ver and libntp/systime.c at
+  the same time by explicitly depending systime_s.c on systime.c.
 (4.2.7p246) 2012/01/06 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2104] ntpdc fault with oversize -c command.
 * [Bug 2106] Fix warnings when using -Wformat-security.

diff --git a/libntp/Makefile.am b/libntp/Makefile.am
index 49202fae6fb9e1c846459d8bf0ab5efa14b55301..9efbc16a37863fe2ee7b2d76d696ba2fdcdf0053 100644 (file)
--- a/libntp/Makefile.am
+++ b/libntp/Makefile.am
@@ -119,5 +119,13 @@ AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 EXTRA_DIST = README
 
+# systime_s.c includes systime.c, and after a deps-ver bump triggers
+# regeneration of dummy .deps/*.Po files, make will be unaware of the
+# need to rebuild systime_s.o for a newer systime.c without an explicit
+# dependency.
+
+systime_s.c: systime.c
+       @touch $@
+
 include $(top_srcdir)/depsver.mf
 include $(top_srcdir)/includes.mf