From: Harlan Stenn Date: Mon, 7 Nov 2011 06:04:24 +0000 (-0500) Subject: Clean up -libm entries regarding libntp.a X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=705e79bb7645a5bfa2ffa857df401f2e70b2df65;p=thirdparty%2Fntp.git Clean up -libm entries regarding libntp.a bk: 4eb774e8_3lu3fCOpfsqEvsyOLozFQ --- diff --git a/ChangeLog b/ChangeLog index f2f3e50b9d..b868b3cc37 100644 --- 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 * Documentation updates from Dave Mills. (4.2.7p232) 2011/11/05 Released by Harlan Stenn diff --git a/adjtimed/Makefile.am b/adjtimed/Makefile.am index a6328a1b0b..b603fed924 100644 --- 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 0d6d269983..d909fbf613 100644 --- 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 64f6148632..2b667de86a 100644 --- 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 9badc61447..0c0e22d781 100644 --- 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 cea4313203..cacc776646 100644 --- 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 293fd346f3..5edc3b8a57 100644 --- 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 5cc76274d4..99fb3d1963 100644 --- 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 745d20f134..6cf0ffc663 100644 --- 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 e3480aa928..a7e2e42ad6 100644 --- 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