From: Dave Hart <hart@ntp.org>
Date: Fri, 6 Jan 2012 22:31:21 +0000 (+0000)
Subject: Fix build break triggered by updating deps-ver and libntp/systime.c at
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9916f6ab8035b58a42c571dfe6ced1d12eef03b4;p=thirdparty%2Fntp.git

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 a5b689c1bc..61c4ba1217 100644
--- 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 49202fae6f..9efbc16a37 100644
--- 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