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 56962d81b9e4643b746d7f8358d8c9e6a7681acf..6502acd4b31bef4d80c72a5aecdfe977da02f734 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-08-04  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * 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 620825f897fef2353ff263a6d6d60ad82fbd9f45..429ab5355b6ed813579bafcba6caad2366c321c2 100644 (file)
--- 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 eb5feadc05eeef9316655e631f8a4523ab5d83ee..7a214d7adb11ebda997e7c386c9260a77ba77ecc 100644 (file)
--- 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