Clean up the libntpq.a build.

bk: 48cf229cRC7xz-3Z1YkaVlmYLWsyYA

diff --git a/ChangeLog b/ChangeLog
index ed0a526cfbe0de0f93d6f2a3a2396d4b99b1ccf4..0a4296aee124d8c67ab194c4910a725cade4f5a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Clean up the libntpq.a build.
 * Regenerate ntp_parser.[ch] from ntp_parser.y
 (4.2.5p132) 2008/09/15 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1067] Multicast DNS service registration must come after the fork

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 0f96f9a2d891ac10631584fd48199ca6f284ea93..6fd5ab11310a01b1ba52662fbc04c17817128ca3 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -6,7 +6,8 @@ AM_CPPFLAGS=    -I$(top_srcdir)/include $(LIBOPTS_CFLAGS)
 ntpq_LDADD=    version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) ../libntp/libntp.a
 noinst_HEADERS=        ntpq.h
 noinst_LIBRARIES=      libntpq.a
-libntpq_a_LIBADD=      version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) ../libntp/libntp.a
+# HMS: I don't think we need libntpq_a_LIBADD...
+#libntpq_a_LIBADD=     version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) ../libntp/libntp.a
 libntpq_a_CFLAGS=      -DNO_MAIN_ALLOWED -DBUILD_AS_LIB
 DISTCLEANFILES=        .version version.c
 ETAGS_ARGS=    Makefile.am