ChangeLog, Makefile.am, Makefile.in:

  * Makefile.am (SUBDIRS): Make librsaref right after includes so we
  can copy any needed header files over.
  * libntp/Makefile.am (INCLUDES): Also look in librsaref for des.h
  * ntpd/Makefile.am (INCLUDES): Ditto
  * util/Makefile.am (INCLUDES): Ditto
  * librsaref/Makefile.am (librsaref_a_SOURCES): Use the des.h from
  the rsaref2 distribution.
  * include/Makefile.am (noinst_HEADERS): No, we don't want des.h

bk: 38b0eb1dg4nuBXQIlcQpsUihdTuh2g

diff --git a/ChangeLog b/ChangeLog
index c706ef664a204eb7ed4a81c353a89f39fc7d9848..8b99119cb9fffb01ce300af9d2fc6861d1669484 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2000-02-21  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * Makefile.am (SUBDIRS): Make librsaref right after includes so we
+       can copy any needed header files over.
+
+       * libntp/Makefile.am (INCLUDES): Also look in librsaref for des.h
+       * ntpd/Makefile.am (INCLUDES): Ditto
+       * util/Makefile.am (INCLUDES): Ditto
+
+       * librsaref/Makefile.am (librsaref_a_SOURCES): Use the des.h from
+       the rsaref2 distribution.
+
        * include/Makefile.am (noinst_HEADERS): No, we don't want des.h
 
 2000-02-20  Harlan Stenn  <stenn@whimsy.udel.edu>

diff --git a/Makefile.am b/Makefile.am
index 6a44e7084b837fd617a7fcd1c4edda5f6bdf6f0b..d3590f50da238f1b2fe6765d755944c1a16baa84 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,9 @@ AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ
 SUBDIRS = \
        scripts \
        include \
+       librsaref       \
        libntp  \
        libparse        \
-       librsaref       \
        ntpd    \
        ntpdate \
        ntpdc   \

diff --git a/Makefile.in b/Makefile.in
index b95709f44df074487cff4037fd3523fbfc6dce49..d754804b6bb21513b7c7a2adb18b00c3711c2cce 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -108,9 +108,9 @@ AUTOMAKE_OPTIONS = util/ansi2knr foreign dist-tarZ
 SUBDIRS = \
        scripts \
        include \
+       librsaref       \
        libntp  \
        libparse        \
-       librsaref       \
        ntpd    \
        ntpdate \
        ntpdc   \

diff --git a/libntp/Makefile.am b/libntp/Makefile.am
index 945b2d371af64b96cdb9bc0fc5597a7e42a48477..51271afdd13cd2604eb2e9da6fdf465e5f106dfc 100644 (file)
--- a/libntp/Makefile.am
+++ b/libntp/Makefile.am
@@ -15,7 +15,7 @@ libntp_a_SOURCES = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
        icom.c audio.c
 libntp_a_LIBADD = @LIBOBJS@
 libntp_a_DEPENDENCIES = @LIBOBJS@
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/librsaref
 ETAGS_ARGS = Makefile.am
 
 noinst_HEADERS = lib_strbuf.h log.h

diff --git a/libntp/Makefile.in b/libntp/Makefile.in
index 46db640331e02a047b251903417b767beb1da4a9..005e5890c8501da11f7bccd6a8beec9081eb6281 100644 (file)
--- a/libntp/Makefile.in
+++ b/libntp/Makefile.in
@@ -119,7 +119,7 @@ libntp_a_SOURCES = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
 
 libntp_a_LIBADD = @LIBOBJS@
 libntp_a_DEPENDENCIES = @LIBOBJS@
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/librsaref
 ETAGS_ARGS = Makefile.am
 
 noinst_HEADERS = lib_strbuf.h log.h

diff --git a/librsaref/Makefile.am b/librsaref/Makefile.am
index 3813d1087541aaa6cce549d0acdfa009e9e4bca9..be575ca51a944ad94bd3d12ce7faa215ee4f718d 100644 (file)
--- a/librsaref/Makefile.am
+++ b/librsaref/Makefile.am
@@ -6,9 +6,9 @@ CLEANFILES = $(EXTRA_LIBRARIES)
 
 # NOTES:
 # don't use RSAREF's global.h - we use ours.
-# We already have a copy of des.h
 
 librsaref_a_SOURCES = \
+       des.h \
        desc.c \
        digit.c \
        digit.h \

diff --git a/librsaref/Makefile.in b/librsaref/Makefile.in
index 121e59430605af6365792a9420bfb585df5d07fc..fe2a22bc692a45a9c1036ebfe1b5ebdc6c159447 100644 (file)
--- a/librsaref/Makefile.in
+++ b/librsaref/Makefile.in
@@ -109,9 +109,9 @@ CLEANFILES = $(EXTRA_LIBRARIES)
 
 # NOTES:
 # don't use RSAREF's global.h - we use ours.
-# We already have a copy of des.h
 
 librsaref_a_SOURCES = \
+       des.h \
        desc.c \
        digit.c \
        digit.h \

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 2fd16c431d57b2b633368dcfbf8ccfabc7db561a..8c53a23cd5bf6fd3773ddcd2b74b1f7d331af61e 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -1,7 +1,7 @@
 #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 bin_PROGRAMS = ntpd
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/librsaref
 # LDADD might need RESLIB and ADJLIB
 LDADD =        version.o @LIBPARSE@ ../libntp/libntp.a @LIBRSAREF@
 ntpd_LDADD = $(LDADD) -lm

diff --git a/ntpd/Makefile.in b/ntpd/Makefile.in
index 0a020780167901df7238e4ed28dac4277a1800b0..f26b375a8ededc804f47d8e28d33155004d58f8c 100644 (file)
--- a/ntpd/Makefile.in
+++ b/ntpd/Makefile.in
@@ -104,7 +104,7 @@ install_sh = @install_sh@
 
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 bin_PROGRAMS = ntpd
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/librsaref
 # LDADD might need RESLIB and ADJLIB
 LDADD = version.o @LIBPARSE@ ../libntp/libntp.a @LIBRSAREF@
 ntpd_LDADD = $(LDADD) -lm

diff --git a/util/Makefile.am b/util/Makefile.am
index 4d703182773f49116dc404e601af6ecaeb898545..504c6b0f0831ed44ae5dfecfc7b3630d7574a0d1 100644 (file)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -4,7 +4,7 @@ bin_PROGRAMS = @MAKE_TICKADJ@ @MAKE_NTPTIME@
 EXTRA_PROGRAMS = byteorder hist jitter kern longsize ntptime \
 precision tickadj testrs6000 timetrim sht
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/librsaref
 # LDADD might need RESLIB and ADJLIB
 LDADD =        ../libntp/libntp.a
 #EXTRA_DIST = README TAGS

diff --git a/util/Makefile.in b/util/Makefile.in
index 6e0a9682061bf63685fecda1568734aa1123731c..6a7d5e209f5864c2204d397530c351bb43383855 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -108,7 +108,7 @@ EXTRA_PROGRAMS = byteorder hist jitter kern longsize ntptime \
 precision tickadj testrs6000 timetrim sht
 
 
-INCLUDES = -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/librsaref
 # LDADD might need RESLIB and ADJLIB
 LDADD = ../libntp/libntp.a
 #EXTRA_DIST = README TAGS