From: Harlan Stenn Date: Fri, 4 Aug 2000 18:43:27 +0000 (-0000) Subject: ChangeLog, Makefile.am, Makefile.in: X-Git-Tag: NTP_4_0_99_M~230 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a579d66d9bc5fa85f3e39448feb516b44609a955;p=thirdparty%2Fntp.git ChangeLog, Makefile.am, Makefile.in: * util/Makefile.am (ntp_genkeys_DEPENDENCIES): Use $U on .o files (ntp_genkeys_LDADD): ditto. bk: 398b0ecfJ-bpV30TLORtv67HvHki6Q --- diff --git a/ChangeLog b/ChangeLog index 56962d81b9..6502acd4b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-08-04 Harlan Stenn + * util/Makefile.am (ntp_genkeys_DEPENDENCIES): Use $U on .o files + (ntp_genkeys_LDADD): ditto. + * ntpd/ntp_crypto.c: Use NTP_KEYSDIR * util/ntp-genkeys.c (snifflink): Ignore ENOENT, too. diff --git a/util/Makefile.am b/util/Makefile.am index 620825f897..429ab5355b 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -4,8 +4,8 @@ bin_PROGRAMS = @MAKE_TICKADJ@ @MAKE_NTPTIME@ ntp-genkeys EXTRA_PROGRAMS = byteorder hist jitter kern longsize ntptime \ precision sht testrs6000 tickadj timetrim -ntp_genkeys_LDADD = ../ntpd/ntp_config.o ../libntp/libntp.a $(LIBRSAREF) -ntp_genkeys_DEPENDENCIES = ../ntpd/ntp_config.o ../libntp/libntp.a $(LIBRSAREF) +ntp_genkeys_LDADD = ../ntpd/ntp_config$U.o ../libntp/libntp.a $(LIBRSAREF) +ntp_genkeys_DEPENDENCIES = ../ntpd/ntp_config$U.o ../libntp/libntp.a $(LIBRSAREF) INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/librsaref # LDADD might need RESLIB and ADJLIB diff --git a/util/Makefile.in b/util/Makefile.in index eb5feadc05..7a214d7adb 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -114,8 +114,8 @@ EXTRA_PROGRAMS = byteorder hist jitter kern longsize ntptime \ precision sht testrs6000 tickadj timetrim -ntp_genkeys_LDADD = ../ntpd/ntp_config.o ../libntp/libntp.a $(LIBRSAREF) -ntp_genkeys_DEPENDENCIES = ../ntpd/ntp_config.o ../libntp/libntp.a $(LIBRSAREF) +ntp_genkeys_LDADD = ../ntpd/ntp_config$U.o ../libntp/libntp.a $(LIBRSAREF) +ntp_genkeys_DEPENDENCIES = ../ntpd/ntp_config$U.o ../libntp/libntp.a $(LIBRSAREF) INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/librsaref # LDADD might need RESLIB and ADJLIB