Attachment #212993 for bug #296832

View | Details | Raw Unified | Return to bug 296832
Collapse All | Expand All

Lines 83-90 man_MANS= ntpd.1 Link Here

(-)ntp-4.2.6/ntpd/Makefile.am (-2 / +2 lines)
83	# floor refclock_wwv.o	83	# floor refclock_wwv.o
84	# which are (usually) provided by -lm.	84	# which are (usually) provided by -lm.
85	keyword_gen_LDADD = ../libntp/libntp.a	85	keyword_gen_LDADD = ../libntp/libntp.a
86	ntpd_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntp.a	86	ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a -lm @LCRYPTO@ @LSCF@
87	ntpdsim_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntpsim.a	87	ntpdsim_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ @LSCF@
88	ntpdsim_CFLAGS = $(CFLAGS) -DSIM	88	ntpdsim_CFLAGS = $(CFLAGS) -DSIM
89	check_y2k_LDADD = $(LDADD) ../libntp/libntp.a	89	check_y2k_LDADD = $(LDADD) ../libntp/libntp.a
90	DISTCLEANFILES = keyword-gen .version version.c	90	DISTCLEANFILES = keyword-gen .version version.c

Lines 10-17 AM_CPPFLAGS= -I$(top_srcdir)/include -I$ Link Here

(-)ntp-4.2.6/ntpdc/Makefile.am (-2 / +2 lines)
10	-I$(top_srcdir)/lib/isc/nothreads/include \	10	-I$(top_srcdir)/lib/isc/nothreads/include \
11	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)	11	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
12	# LDADD might need RESLIB and ADJLIB	12	# LDADD might need RESLIB and ADJLIB
13	ntpdc_LDADD= version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \	13	ntpdc_LDADD= version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
14	../libntp/libntp.a	14	../libntp/libntp.a @LCRYPTO@
15	# ntpdc-layout doesn't need any additional libraries at all	15	# ntpdc-layout doesn't need any additional libraries at all
16	ntpdc_layout_LDADD=	16	ntpdc_layout_LDADD=
17	DISTCLEANFILES= .version version.c	17	DISTCLEANFILES= .version version.c

Lines 8-15 AM_CPPFLAGS= -I$(top_srcdir)/include -I$ Link Here

(-)ntp-4.2.6/ntpq/Makefile.am (-2 / +2 lines)
8	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)	8	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
9		9
10	# LDADD might need RESLIB and ADJLIB	10	# LDADD might need RESLIB and ADJLIB
11	ntpq_LDADD= version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \	11	ntpq_LDADD= version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
12	../libntp/libntp.a	12	../libntp/libntp.a @LCRYPTO@
13	noinst_HEADERS= ntpq.h	13	noinst_HEADERS= ntpq.h
14	noinst_LIBRARIES= libntpq.a	14	noinst_LIBRARIES= libntpq.a
15	# HMS: I don't think we need libntpq_a_LIBADD...	15	# HMS: I don't think we need libntpq_a_LIBADD...

Lines 358-365 man_MANS = ntpd.1 Link Here

(-)ntp-4.2.6/ntpd/Makefile.in (-2 / +2 lines)
358	# floor refclock_wwv.o	358	# floor refclock_wwv.o
359	# which are (usually) provided by -lm.	359	# which are (usually) provided by -lm.
360	keyword_gen_LDADD = ../libntp/libntp.a	360	keyword_gen_LDADD = ../libntp/libntp.a
361	ntpd_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntp.a	361	ntpd_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntp.a -lm @LCRYPTO@ @LSCF@
362	ntpdsim_LDADD = $(LDADD) -lm @LCRYPTO@ @LSCF@ $(LIBOPTS_LDADD) ../libntp/libntpsim.a	362	ntpdsim_LDADD = $(LDADD) $(LIBOPTS_LDADD) ../libntp/libntpsim.a -lm @LCRYPTO@ @LSCF@
363	ntpdsim_CFLAGS = $(CFLAGS) -DSIM	363	ntpdsim_CFLAGS = $(CFLAGS) -DSIM
364	check_y2k_LDADD = $(LDADD) ../libntp/libntp.a	364	check_y2k_LDADD = $(LDADD) ../libntp/libntp.a
365	DISTCLEANFILES = keyword-gen .version version.c	365	DISTCLEANFILES = keyword-gen .version version.c

Lines 264-271 AM_CPPFLAGS = -I$(top_srcdir)/include -I Link Here

(-)ntp-4.2.6/ntpdc/Makefile.in (-2 / +2 lines)
264	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)	264	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
265		265
266	# LDADD might need RESLIB and ADJLIB	266	# LDADD might need RESLIB and ADJLIB
267	ntpdc_LDADD = version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \	267	ntpdc_LDADD = version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
268	../libntp/libntp.a	268	../libntp/libntp.a @LCRYPTO@
269		269
270	# ntpdc-layout doesn't need any additional libraries at all	270	# ntpdc-layout doesn't need any additional libraries at all
271	ntpdc_layout_LDADD =	271	ntpdc_layout_LDADD =

Lines 265-272 AM_CPPFLAGS = -I$(top_srcdir)/include -I Link Here

(-)ntp-4.2.6/ntpq/Makefile.in (-2 / +2 lines)
265		265
266		266
267	# LDADD might need RESLIB and ADJLIB	267	# LDADD might need RESLIB and ADJLIB
268	ntpq_LDADD = version.o @LCRYPTO@ @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \	268	ntpq_LDADD = version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
269	../libntp/libntp.a	269	../libntp/libntp.a @LCRYPTO@
270		270
271	noinst_HEADERS = ntpq.h	271	noinst_HEADERS = ntpq.h
272	noinst_LIBRARIES = libntpq.a	272	noinst_LIBRARIES = libntpq.a

Return to bug 296832