Build ntpq and libntpq.a with NTP_HARD_*FLAGS

bk: 59f2e7c28yoh81sMcRdr5FmPJwwPRA

diff --git a/ChangeLog b/ChangeLog
index b3224e1b5b23869d2cd09d0f9445f843ca214515..d6dc77330a25587fb48038a691b6d80f0ef02e1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,7 @@
 * Typos.  HStenn.
 * test_ntp_scanner_LDADD needs ntpd/ntp_io.o.  HStenn.
 * refclock_jjy.c: Add missing "%s" to an msyslog() call.  HStenn.
+* Build ntpq and libntpq.a with NTP_HARD_*FLAGS.  perlinger@ntp.org
 
 ---
 (4.2.8p10) 2017/03/21 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 06018fc63aaabd0a52c722955ae0efb25b95dd16..074bdcef6e95f0ce2d2ad3d060364b14ecc26a00 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -21,9 +21,13 @@ ntpq_LDADD  = version.o $(LIBOPTS_LDADD)
 ntpq_LDADD += ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
 ntpq_LDADD += $(PTHREAD_LIBS) $(EDITLINE_LIBS)
 ntpq_LDADD += $(LDADD_NTP)
+ntpq_LDADD += $(NTP_HARD_LDFLAGS)
 noinst_HEADERS=        ntpq.h
 noinst_LIBRARIES=      libntpq.a
-libntpq_a_CFLAGS=      -DNO_MAIN_ALLOWED -DBUILD_AS_LIB
+libntpq_a_CFLAGS=      $(AM_CFLAGS)
+libntpq_a_CFLAGS+=     -DNO_MAIN_ALLOWED -DBUILD_AS_LIB
+libntpq_a_CPPFLAGS=    $(AM_CPPFLAGS)
+libntpq_a_LDFLAGS=     $(AM_LDFLAGS)
 CLEANFILES=
 DISTCLEANFILES=        .version version.c config.log $(man_MANS)
 ETAGS_ARGS=    Makefile.am