Quiet some libntpq-related warnings

bk: 48c8c011g6SYt6nZApnZ-OWZ25CzSA

diff --git a/ChangeLog b/ChangeLog
index d7c4fd7c3520efc7a023f428570a1f1c7d3f01cf..647f8083479e9ad1cc178199e19eb176b53fdee3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Quiet some libntpq-related warnings.
 (4.2.5p128) 2008/09/08 Released by Harlan Stenn <stenn@ntp.org>
 * Import Heiko Gerstung's GSoC2008 NTP MIB daemon.
 (4.2.5p127) 2008/09/01 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 2a1f9b865551a82b803ee9d764c500dba4f33f1e..0f96f9a2d891ac10631584fd48199ca6f284ea93 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -6,8 +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_LDADD= version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) ../libntp/libntp.a
-libntpq_CFLAGS=        -DNO_MAIN_ALLOWED -DBUILD_AS_LIB
+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
 EXTRA_DIST=    ntpq-opts.def ntpq.1 ntpq-opts.texi ntpq-opts.menu

diff --git a/ntpq/libntpq.c b/ntpq/libntpq.c
index 56c4463707194ae295ef289a6e0589a06c81b30a..6abdf32d90ecc52990a156faf212a6af90272bd9 100644 (file)
--- a/ntpq/libntpq.c
+++ b/ntpq/libntpq.c
@@ -11,7 +11,7 @@
  ****************************************************************************/
 #define _LIBNTPQC
 #define NO_MAIN_ALLOWED 1
-#define BUILD_AS_LIB
+/* #define BUILD_AS_LIB                Already provided by the Makefile */
 
 #include "ntpq.c"
 #include "libntpq.h"