Clean up -libm entries regarding libntp.a

bk: 4eb774e8_3lu3fCOpfsqEvsyOLozFQ

diff --git a/ChangeLog b/ChangeLog
index f2f3e50b9d194b5e089bb66e4cd718765c9d33fa..b868b3cc37eff5014751bcdbec854a68da41164b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Clean up -libm entries regarding libntp.a
 (4.2.7p233) 2011/11/06 Released by Harlan Stenn <stenn@ntp.org>
 * Documentation updates from Dave Mills.
 (4.2.7p232) 2011/11/05 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/adjtimed/Makefile.am b/adjtimed/Makefile.am
index a6328a1b0bb1271174ab6e3a679c5cccaff7d22c..b603fed9242823cdcea13b544da77ece37366ecc 100644 (file)
--- a/adjtimed/Makefile.am
+++ b/adjtimed/Makefile.am
@@ -13,7 +13,7 @@ AM_CFLAGS = $(CFLAGS_NTP)
 AM_CPPFLAGS  = $(NTP_INCS)
 AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
-LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(PTHREAD_LIBS)
+LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS)
 
 include $(top_srcdir)/bincheck.mf
 include $(top_srcdir)/sntp/check-libntp.mf

diff --git a/clockstuff/Makefile.am b/clockstuff/Makefile.am
index 0d6d2699834774e4b949bfdf5e0c727236fabe3b..d909fbf61331f4b872f19f6695818eb6e4968f36 100644 (file)
--- a/clockstuff/Makefile.am
+++ b/clockstuff/Makefile.am
@@ -6,8 +6,8 @@ AM_CFLAGS = $(CFLAGS_NTP)
 AM_CPPFLAGS  = $(NTP_INCS)
 AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
-LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(PTHREAD_LIBS)
-propdelay_LDADD = $(LIBM) $(LDADD)
+LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS)
+propdelay_LDADD = $(LDADD)
 
 BUILT_SOURCES =
 CLEANFILES =

diff --git a/libparse/Makefile.am b/libparse/Makefile.am
index 64f6148632c245d4cbee5aaecbe17b4b9d1625bd..2b667de86aaff9f35287fa13a872125ff6d47011 100644 (file)
--- a/libparse/Makefile.am
+++ b/libparse/Makefile.am
@@ -120,10 +120,10 @@ kparse_conf.o: $(srcdir)/parse_conf.c
        $(COMPILE) $(K_CFLAGS) -c $(srcdir)/parse_conf.c -o $@
 
 parsestreams.loadable_module.o: $(parsestreams_OBJECTS) libparse_kernel.a ../libntp/libntp.a
-       $(LD) -r -o $@ $(parsestreams_OBJECTS) libparse_kernel.a ../libntp/libntp.a
+       $(LD) -r -o $@ $(parsestreams_OBJECTS) libparse_kernel.a ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
 
 parse: $(parsesolaris_OBJECTS) libparse_kernel.a ../libntp/libntp.a
-       $(LD) -r -o $@ $(parsesolaris_OBJECTS) libparse_kernel.a ../libntp/libntp.a
+       $(LD) -r -o $@ $(parsesolaris_OBJECTS) libparse_kernel.a ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
 
 parsesolaris.o: sys/systm.h
 

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 9badc614474fc522372b449e3f5226eb56c0b0d4..0c0e22d781add73123236e14ff2395fc6e7153d7 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -87,12 +87,12 @@ man_MANS=   ntpd.$(NTPD_MS)
 
 LDADD_NTPD_COMMON  = @LDADD_LIBNTP@ $(LIBOPTS_LDADD) $(PTHREAD_LIBS)
 LDADD_NTPD_COMMON += $(LIBM) $(LCRYPTO) $(LSCF)
-ntpd_LDADD = $(LDADD) ../libntp/libntp.a $(LDADD_NTPD_COMMON)
+ntpd_LDADD = $(LDADD) ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(LDADD_NTPD_COMMON)
 ntpdsim_LDADD = $(LDADD) ../libntp/libntpsim.a $(LDADD_NTPD_COMMON)
 ntpdsim_CPPFLAGS = $(AM_CPPFLAGS) -DSIM
-check_y2k_LDADD = $(LDADD) ../libntp/libntp.a $(LDADD_LIBNTP) $(PTHREAD_LIBS)
+check_y2k_LDADD = $(LDADD) ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(LDADD_LIBNTP) $(PTHREAD_LIBS)
 ## we don't want $(LDADD) in keyword_gen_LDADD
-keyword_gen_LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(PTHREAD_LIBS)
+keyword_gen_LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS)
 
 DISTCLEANFILES =               \
        keyword-gen             \

diff --git a/ntpdc/Makefile.am b/ntpdc/Makefile.am
index cea431320339e9086e474e9839a666a6f9b559ef..cacc776646b35f93d3318abd4b02fb868b8a8af3 100644 (file)
--- a/ntpdc/Makefile.am
+++ b/ntpdc/Makefile.am
@@ -15,8 +15,9 @@ AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
 AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 # LDADD might need RESLIB and ADJLIB
-ntpdc_LDADD  = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a
-ntpdc_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(EDITLINE_LIBS)
+ntpdc_LDADD  = version.o $(LIBOPTS_LDADD)
+ntpdc_LDADD  = ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
+ntpdc_LDADD += $(PTHREAD_LIBS) $(EDITLINE_LIBS)
 ntpdc_LDADD += $(LCRYPTO)
 # ntpdc-layout doesn't need any additional libraries at all
 ntpdc_layout_LDADD=

diff --git a/ntpq/Makefile.am b/ntpq/Makefile.am
index 293fd346f38f2edd5bb9c5837a3a2ad9300441b2..5edc3b8a57d1bb329777f8eefbc54b8643ba97fc 100644 (file)
--- a/ntpq/Makefile.am
+++ b/ntpq/Makefile.am
@@ -12,8 +12,9 @@ AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
 AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 # LDADD might need RESLIB and ADJLIB
-ntpq_LDADD  = version.o $(LIBOPTS_LDADD) $(LIBM) ../libntp/libntp.a
-ntpq_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(EDITLINE_LIBS)
+ntpq_LDADD  = version.o $(LIBOPTS_LDADD)
+ntpq_LDADD  = ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
+ntpq_LDADD += $(PTHREAD_LIBS) $(EDITLINE_LIBS)
 ntpq_LDADD += $(LCRYPTO)
 noinst_HEADERS=        ntpq.h
 noinst_LIBRARIES=      libntpq.a

diff --git a/parseutil/Makefile.am b/parseutil/Makefile.am
index 5cc76274d4b9f9ed6285d0b14a92ae3922d6f353..99fb3d19632e9953fca1b1152b27a760751ad29d 100644 (file)
--- a/parseutil/Makefile.am
+++ b/parseutil/Makefile.am
@@ -10,7 +10,7 @@ AM_CFLAGS = $(CFLAGS_NTP)
 AM_CPPFLAGS  = $(NTP_INCS)
 AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
-LDADD = ../libntp/libntp.a $(LDADD_LIBNTP)
+LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
 
 ETAGS_ARGS = Makefile.am
 DISTCLEANFILES = $(EXTRA_PROGRAMS)

diff --git a/sntp/Makefile.am b/sntp/Makefile.am
index 745d20f13479562ccb3120801ad32250e97597b4..6cf0ffc66324d3e02896199f52a54b2f229223bb 100644 (file)
--- a/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@ -14,9 +14,7 @@ AM_CPPFLAGS += $(CPPFLAGS_NTP)
 LDADD  = version.o
 LDADD += $(LIBOPTS_LDADD)
 LDADD += $(LDADD_LIBEVENT)
-LDADD += $(LIBM)
-LDADD += ../libntp/libntp.a
-LDADD += $(LDADD_LIBNTP)
+LDADD += ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
 LDADD += $(PTHREAD_LIBS)
 LDADD += $(LCRYPTO)
 

diff --git a/util/Makefile.am b/util/Makefile.am
index e3480aa9284f0a8f90ee1477d534fe5bfd1def87..a7e2e42ad6248a5a7f30a4f4a7e53313f774e509 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -14,8 +14,8 @@ AM_CPPFLAGS += $(LIBOPTS_CFLAGS)
 AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 # LDADD might need RESLIB and ADJLIB
-LDADD=         ../libntp/libntp.a $(LDADD_LIBNTP) $(PTHREAD_LIBS)
-tg2_LDADD=     ../libntp/libntp.a $(LIBM)
+LDADD=         ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS)
+tg2_LDADD=     ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
 ntp_keygen_LDADD  = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a
 ntp_keygen_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(LCRYPTO)
 ntp_keygen_SOURCES = ntp-keygen.c ntp-keygen-opts.c ntp-keygen-opts.h