From: Harlan Stenn Date: Mon, 21 Feb 2000 07:37:01 +0000 (-0000) Subject: ChangeLog, Makefile.am, Makefile.in: X-Git-Tag: NTP_4_0_99_G~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1c489674f525ed82db7ef2f5fc8738d70b5fc8d;p=thirdparty%2Fntp.git 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 c706ef664..8b99119cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2000-02-21 Harlan Stenn + * 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 diff --git a/Makefile.am b/Makefile.am index 6a44e7084..d3590f50d 100644 --- 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 b95709f44..d754804b6 100644 --- 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 945b2d371..51271afdd 100644 --- 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 46db64033..005e5890c 100644 --- 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 3813d1087..be575ca51 100644 --- 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 121e59430..fe2a22bc6 100644 --- 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 2fd16c431..8c53a23cd 100644 --- 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 0a0207801..f26b375a8 100644 --- 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 4d7031827..504c6b0f0 100644 --- 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 6e0a96820..6a7d5e209 100644 --- 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