From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 11 Sep 2008 06:52:01 +0000 (-0400)
Subject: Quiet some libntpq-related warnings
X-Git-Tag: NTP_4_2_5P129~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bf88614a1578ecf0934187f1c2b2fa1436cd9fa;p=thirdparty%2Fntp.git

Quiet some libntpq-related warnings

bk: 48c8c011g6SYt6nZApnZ-OWZ25CzSA
---

diff --git a/ChangeLog b/ChangeLog
index d7c4fd7c3..647f80834 100644
--- 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 2a1f9b865..0f96f9a2d 100644
--- 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 56c446370..6abdf32d9 100644
--- 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"