[Bug 2900] libntp build order problem

bk: 5a45e3bf-KR0fo5HD21-cbY-iZzw5g

diff --git a/ChangeLog b/ChangeLog
index 6aa156f96c31d3fdd09d0c5218411e7d2a930b82..e887d5d45f757423d7cb067449ad06ac6f1d820c 100644 (file)
--- 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 ed9a546280d04f20dd4e61d7012c03cf96e23059..7c95863d8a1dd840bfab7b5409fe4719247fc25b 100644 (file)
--- 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 b867a3a9a9f72232ee9ce19d4aa7bfea8ae16049..d38796857fecc2cb7266f2fb03b8148b2c0fa5e0 100644 (file)
--- 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