Deleted Added
full compact
Makefile.am (1.1.1.4) Makefile.am (1.1.1.5)
1NULL=
2
3bin_PROGRAMS= $(NTPD_DB) $(NTPDSIM_DB)
4libexec_PROGRAMS= $(NTPD_DL) $(NTPDSIM_DL)
5sbin_PROGRAMS= $(NTPD_DS) $(NTPDSIM_DS)
6
7noinst_LIBRARIES= libntpd.a
8

--- 76 unchanged lines hidden (view full) ---

85man_MANS= ntpd.$(NTPD_MS)
86
87# ntpdsim.1 is a remnant along with all the ntpdsim-opts.* files, the
88# simulator currently uses ntpd-opts.[ch]. This also means there is no
89# longer a reason to have ntpdbase-opts.def split off of ntpd-opts.def.
90
91LDADD_NTPD_COMMON = $(LDADD_LIBNTP) $(LIBOPTS_LDADD) $(PTHREAD_LIBS)
92LDADD_NTPD_COMMON += $(LIBM) $(LDADD_NTP) $(LSCF)
1NULL=
2
3bin_PROGRAMS= $(NTPD_DB) $(NTPDSIM_DB)
4libexec_PROGRAMS= $(NTPD_DL) $(NTPDSIM_DL)
5sbin_PROGRAMS= $(NTPD_DS) $(NTPDSIM_DS)
6
7noinst_LIBRARIES= libntpd.a
8

--- 76 unchanged lines hidden (view full) ---

85man_MANS= ntpd.$(NTPD_MS)
86
87# ntpdsim.1 is a remnant along with all the ntpdsim-opts.* files, the
88# simulator currently uses ntpd-opts.[ch]. This also means there is no
89# longer a reason to have ntpdbase-opts.def split off of ntpd-opts.def.
90
91LDADD_NTPD_COMMON = $(LDADD_LIBNTP) $(LIBOPTS_LDADD) $(PTHREAD_LIBS)
92LDADD_NTPD_COMMON += $(LIBM) $(LDADD_NTP) $(LSCF)
93ntpd_LDADD = $(LDADD) ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(LDADD_NTPD_COMMON)
93ntpd_LDADD = $(LDADD) ../libntp/libntp.a $(LDADD_NTPD_COMMON) $(LDADD_LIBUTIL)
94ntpdsim_LDADD = $(LDADD) ../libntp/libntpsim.a $(LDADD_NTPD_COMMON)
95ntpdsim_CPPFLAGS = $(AM_CPPFLAGS) -DSIM
96check_y2k_LDADD = $(LDADD) ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(LDADD_LIBNTP) $(PTHREAD_LIBS)
97## we don't want $(LDADD) in keyword_gen_LDADD
98keyword_gen_LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS)
99
100DISTCLEANFILES = \
101 keyword-gen \

--- 337 unchanged lines hidden ---
94ntpdsim_LDADD = $(LDADD) ../libntp/libntpsim.a $(LDADD_NTPD_COMMON)
95ntpdsim_CPPFLAGS = $(AM_CPPFLAGS) -DSIM
96check_y2k_LDADD = $(LDADD) ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(LDADD_LIBNTP) $(PTHREAD_LIBS)
97## we don't want $(LDADD) in keyword_gen_LDADD
98keyword_gen_LDADD = ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS)
99
100DISTCLEANFILES = \
101 keyword-gen \

--- 337 unchanged lines hidden ---