From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 29 Dec 2017 06:42:07 +0000 (-0800)
Subject: [Bug 2900] libntp build order problem
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=612acdb0f5363218d25b525897ab9256d71e99c0;p=thirdparty%2Fntp.git

[Bug 2900] libntp build order problem

bk: 5a45e3bf-KR0fo5HD21-cbY-iZzw5g
---

diff --git a/ChangeLog b/ChangeLog
index 6aa156f96..e887d5d45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,7 @@
 * [Bug 3358] Spurious KoD log messages in .INIT. phase.  HStenn.
 * [Bug 3016] wrong error position reported for bad ":config pool"
   - fixed location counter & ntpq output <perlinger@ntp.org>
+* [Bug 2900] libntp build order problem.  HStenn.
 * [Bug 2878] Tests are cluttering up syslog <perlinger@ntp.org>
 * [Bug 2737] Wrong phone number listed for USNO. ntp-bugs@bodosom.net,
   perlinger@ntp.org
diff --git a/Makefile.am b/Makefile.am
index ed9a54628..7c95863d8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,10 +5,10 @@ NULL =
 # moved sntp first to get libtool and libevent built.
 
 SUBDIRS =		\
-	sntp		\
 	scripts		\
 	include		\
 	libntp		\
+	sntp		\
 	libparse	\
 	ntpd		\
 	ntpdate		\
diff --git a/sntp/check-libntp.mf b/sntp/check-libntp.mf
index b867a3a9a..d38796857 100644
--- a/sntp/check-libntp.mf
+++ b/sntp/check-libntp.mf
@@ -8,7 +8,6 @@ BUILT_SOURCES	+= check-libntp
 CLEANFILES	+= check-libntp
 
 check-libntp: ../libntp/libntp.a
-	@echo stamp > $@
 
 ../libntp/libntp.a:
 	cd ../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a