1c1,2
< # Makefile.in generated automatically by automake 1.5 from Makefile.am.
---
> # Makefile.in generated by automake 1.7.7 from Makefile.am.
> # @configure_input@
3c4
< # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
---
> # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
16,19d16
< #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
<
< SHELL = @SHELL@
<
23,37d19
< prefix = @prefix@
< exec_prefix = @exec_prefix@
<
< bindir = @bindir@
< sbindir = @sbindir@
< libexecdir = @libexecdir@
< datadir = @datadir@
< sysconfdir = @sysconfdir@
< sharedstatedir = @sharedstatedir@
< localstatedir = @localstatedir@
< libdir = @libdir@
< infodir = @infodir@
< mandir = @mandir@
< includedir = @includedir@
< oldincludedir = /usr/include
43,47c25
< ACLOCAL = @ACLOCAL@
< AUTOCONF = @AUTOCONF@
< AUTOMAKE = @AUTOMAKE@
< AUTOHEADER = @AUTOHEADER@
<
---
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
49,51c27,29
< INSTALL_PROGRAM = @INSTALL_PROGRAM@
< INSTALL_DATA = @INSTALL_DATA@
< INSTALL_SCRIPT = @INSTALL_SCRIPT@
---
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
53c31
< transform = @program_transform_name@
---
> transform = $(program_transform_name)
60d37
< build_alias = @build_alias@
62d38
< host_alias = @host_alias@
64d39
< target_alias = @target_alias@
65a41,43
> ACLOCAL = @ACLOCAL@
> AMDEP_FALSE = @AMDEP_FALSE@
> AMDEP_TRUE = @AMDEP_TRUE@
67c45,48
< AUTOKEY = @AUTOKEY@
---
> ARLIB_DIR = @ARLIB_DIR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
69a51
> CCDEPMODE = @CCDEPMODE@
73a56,57
> CPPFLAGS = @CPPFLAGS@
> CYGPATH_W = @CYGPATH_W@
74a59
> DEFS = @DEFS@
75a61,63
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
77a66
> EGREP = @EGREP@
78a68,70
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
79a72
> LCRYPTO = @LCRYPTO@
80a74
> LIBOBJS = @LIBOBJS@
82c76
< LIBRSAREF = @LIBRSAREF@
---
> LIBS = @LIBS@
83a78,79
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
85a82
> MAKE_LIBNTPSIM = @MAKE_LIBNTPSIM@
88c85
< MAKE_LIBRSAREF = @MAKE_LIBRSAREF@
---
> MAKE_NTPDSIM = @MAKE_NTPDSIM@
90c87
< MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
---
> MAKE_NTP_KEYGEN = @MAKE_NTP_KEYGEN@
91a89
> MAKE_SNTP = @MAKE_SNTP@
98a97,101
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
> PACKAGE_NAME = @PACKAGE_NAME@
> PACKAGE_STRING = @PACKAGE_STRING@
> PACKAGE_TARNAME = @PACKAGE_TARNAME@
> PACKAGE_VERSION = @PACKAGE_VERSION@
99a103
> PATH_SEPARATOR = @PATH_SEPARATOR@
103,106c107,110
< RSADIR = @RSADIR@
< RSAOBJS = @RSAOBJS@
< RSAREF = @RSAREF@
< RSASRCS = @RSASRCS@
---
> READLINE_LIBS = @READLINE_LIBS@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
109a114,118
> ac_ct_CC = @ac_ct_CC@
> ac_ct_RANLIB = @ac_ct_RANLIB@
> ac_ct_STRIP = @ac_ct_STRIP@
> am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
> am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
110a120
> am__leading_dot = @am__leading_dot@
111a122,136
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
> datadir = @datadir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
> includedir = @includedir@
> infodir = @infodir@
112a138,153
> libdir = @libdir@
> libexecdir = @libexecdir@
> localstatedir = @localstatedir@
> mandir = @mandir@
> oldincludedir = @oldincludedir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
> subdirs = @subdirs@
> sysconfdir = @sysconfdir@
> target = @target@
> target_alias = @target_alias@
> target_cpu = @target_cpu@
> target_os = @target_os@
> target_vendor = @target_vendor@
113a155
> #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
115a158,160
> EXTRA_PROGRAMS = ntpdc-layout
> EXTRA_DATA = check-layout
> BUILT_SOURCES = maybe-layout
118c163,165
< LDADD = version.o ../libntp/libntp.a @LIBRSAREF@
---
> ntpdc_LDADD = version.o ../libntp/libntp.a @READLINE_LIBS@
> # ntpdc-layout doesn't need any additional libraries at all
> ntpdc_layout_LDADD =
119a167
> CLEANFILES = check-layout layout.here nl.c ntpdc-layout
121c169
< #EXTRA_DIST = ntpdc.mak
---
> EXTRA_DIST = nl_in.c nl.pl layout.std
125a174
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
128c177,178
< CONFIG_CLEAN_FILES =
---
> CONFIG_CLEAN_FILES = nl.pl
> EXTRA_PROGRAMS = ntpdc-layout$(EXEEXT)
134d183
< ntpdc_LDADD = $(LDADD)
136a186,189
> ntpdc_layout_SOURCES = ntpdc-layout.c
> ntpdc_layout_OBJECTS = ntpdc-layout$U.$(OBJEXT)
> ntpdc_layout_DEPENDENCIES =
> ntpdc_layout_LDFLAGS =
138d190
< DEFS = @DEFS@
140,142d191
< CPPFLAGS = @CPPFLAGS@
< LDFLAGS = @LDFLAGS@
< LIBS = @LIBS@
144c193,196
< @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/ntpdc$U.Po $(DEPDIR)/ntpdc_ops$U.Po
---
> am__depfiles_maybe = depfiles
> @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ntpdc$U.Po \
> @AMDEP_TRUE@ ./$(DEPDIR)/ntpdc-layout$U.Po \
> @AMDEP_TRUE@ ./$(DEPDIR)/ntpdc_ops$U.Po
149c201
< DIST_SOURCES = $(ntpdc_SOURCES)
---
> DIST_SOURCES = $(ntpdc_SOURCES) ntpdc-layout.c
152,153c204,206
< DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
< SOURCES = $(ntpdc_SOURCES)
---
> DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.in \
> Makefile.am nl.pl.in
> SOURCES = $(ntpdc_SOURCES) ntpdc-layout.c
155c208,209
< all: all-am
---
> all: $(BUILT_SOURCES)
> $(MAKE) $(AM_MAKEFLAGS) all-am
163,165c217,220
< cd $(top_builddir) && \
< CONFIG_HEADERS= CONFIG_LINKS= \
< CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
---
> cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
> nl.pl: $(top_builddir)/config.status nl.pl.in
> cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
> binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
173,175c228,230
< f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
< echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
< $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
---
> f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
> echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
> $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
182c237
< f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
---
> f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
191a247,249
> ntpdc-layout$(EXEEXT): $(ntpdc_layout_OBJECTS) $(ntpdc_layout_DEPENDENCIES)
> @rm -f ntpdc-layout$(EXEEXT)
> $(LINK) $(ntpdc_layout_LDFLAGS) $(ntpdc_layout_OBJECTS) $(ntpdc_layout_LDADD) $(LIBS)
204c262
< -rm -f *_.c
---
> -test "$U" = "" || rm -f *_.c
206,207c264,266
< @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntpdc$U.Po@am__quote@
< @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntpdc_ops$U.Po@am__quote@
---
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntpdc$U.Po@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntpdc-layout$U.Po@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntpdc_ops$U.Po@am__quote@
209,211d267
< distclean-depend:
< -rm -rf $(DEPDIR)
<
213,216c269,277
< @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
< @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
< @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
< $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
---
> @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
> @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
> @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
> @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
> @am__fastdepCC_TRUE@ fi
> @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
> @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
219,223c280,288
< @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
< @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
< @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
< $(COMPILE) -c `cygpath -w $<`
< CCDEPMODE = @CCDEPMODE@
---
> @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
> @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
> @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
> @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
> @am__fastdepCC_TRUE@ fi
> @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
> @am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
225c290,292
< $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc.c; then echo $(srcdir)/ntpdc.c; else echo ntpdc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpdc_.c || rm -f ntpdc_.c
---
> $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc.c; then echo $(srcdir)/ntpdc.c; else echo ntpdc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
> ntpdc-layout_.c: ntpdc-layout.c $(ANSI2KNR)
> $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc-layout.c; then echo $(srcdir)/ntpdc-layout.c; else echo ntpdc-layout.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
227,228c294,296
< $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc_ops.c; then echo $(srcdir)/ntpdc_ops.c; else echo ntpdc_ops.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpdc_ops_.c || rm -f ntpdc_ops_.c
< ntpdc_.$(OBJEXT) ntpdc_ops_.$(OBJEXT) : $(ANSI2KNR)
---
> $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc_ops.c; then echo $(srcdir)/ntpdc_ops.c; else echo ntpdc_ops.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
> ntpdc_.$(OBJEXT) ntpdc-layout_.$(OBJEXT) ntpdc_ops_.$(OBJEXT) : \
> $(ANSI2KNR)
230a299,304
> ETAGS = etags
> ETAGSFLAGS =
>
> CTAGS = ctags
> CTAGSFLAGS =
>
234c308
< list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
---
> list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
240c314
< mkid -fID $$unique $(LISP)
---
> mkid -fID $$unique
246c320
< list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
---
> list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
252,253c326,328
< test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
< || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
---
> test -z "$(ETAGS_ARGS)$$tags$$unique" \
> || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
> $$tags $$unique
254a330,344
> ctags: CTAGS
> CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
> $(TAGS_FILES) $(LISP)
> tags=; \
> here=`pwd`; \
> list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> unique=`for i in $$list; do \
> if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
> done | \
> $(AWK) ' { files[$$0] = 1; } \
> END { for (i in files) print i; }'`; \
> test -z "$(CTAGS_ARGS)$$tags$$unique" \
> || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
> $$tags $$unique
>
256c346
< here=`CDPATH=: && cd $(top_builddir) && pwd` \
---
> here=`$(am__cd) $(top_builddir) && pwd` \
261,262c351
< -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
<
---
> -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
269,270c358,365
< @for file in $(DISTFILES); do \
< if test -f $$file; then d=.; else d=$(srcdir); fi; \
---
> @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
> topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
> list='$(DISTFILES)'; for file in $$list; do \
> case $$file in \
> $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
> $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
> esac; \
> if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
273c368,371
< $(mkinstalldirs) "$(distdir)/$$dir"; \
---
> dir="/$$dir"; \
> $(mkinstalldirs) "$(distdir)$$dir"; \
> else \
> dir=''; \
276,277c374,377
< cp -pR $$d/$$file $(distdir) \
< || exit 1; \
---
> if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> fi; \
> cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
285c385,386
< check: check-am
---
> check: $(BUILT_SOURCES)
> $(MAKE) $(AM_MAKEFLAGS) check-am
290,291c391,392
<
< install: install-am
---
> install: $(BUILT_SOURCES)
> $(MAKE) $(AM_MAKEFLAGS) install-am
301a403
> INSTALL_STRIP_FLAG=-s \
306a409
> -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
309c412
< -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
---
> -rm -f $(CONFIG_CLEAN_FILES)
314a418
> -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
319a424,425
> -rm -rf ./$(DEPDIR)
> -rm -f Makefile
321,322c427,428
< distclean-am: clean-am distclean-compile distclean-depend \
< distclean-generic distclean-tags
---
> distclean-am: clean-am distclean-compile distclean-generic \
> distclean-tags
342a449,450
> -rm -rf ./$(DEPDIR)
> -rm -f Makefile
349a458,465
> pdf: pdf-am
>
> pdf-am:
>
> ps: ps-am
>
> ps-am:
>
352,353c468,469
< .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
< clean-generic distclean distclean-compile distclean-depend \
---
> .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
> clean-generic ctags distclean distclean-compile \
360,361c476,477
< mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
< uninstall-binPROGRAMS uninstall-info-am
---
> mostlyclean-generic mostlyclean-kr pdf pdf-am ps ps-am tags \
> uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am
363a480,492
> maybe-layout:
> @case "${PATH_PERL}" in \
> /*) ${MAKE} check-layout ;; \
> esac
>
> ntpdc-layout.o: nl.c
>
> layout.here: ntpdc-layout
> ./ntpdc-layout > $@
>
> check-layout: ntpdc-layout layout.std layout.here
> cmp $(srcdir)/layout.std layout.here && echo stamp > $@
>
369c498
< version.o: $(ntpdc_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile
---
> version.o: $(ntpdc_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/version
371a501,505
>
> # I ran nl_in.c (attached, to be installed into ntpdc) through
> # $(CC) -E nl_in.c | nl.pl > nl.c
> nl.c: nl_in.c nl.pl
> $(CC) -E $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(srcdir)/nl_in.c | ./nl.pl > nl.c
< # Makefile.in generated automatically by automake 1.5 from Makefile.am.
---
> # Makefile.in generated by automake 1.7.7 from Makefile.am.
> # @configure_input@
3c4
< # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
---
> # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
16,19d16
< #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
<
< SHELL = @SHELL@
<
23,37d19
< prefix = @prefix@
< exec_prefix = @exec_prefix@
<
< bindir = @bindir@
< sbindir = @sbindir@
< libexecdir = @libexecdir@
< datadir = @datadir@
< sysconfdir = @sysconfdir@
< sharedstatedir = @sharedstatedir@
< localstatedir = @localstatedir@
< libdir = @libdir@
< infodir = @infodir@
< mandir = @mandir@
< includedir = @includedir@
< oldincludedir = /usr/include
43,47c25
< ACLOCAL = @ACLOCAL@
< AUTOCONF = @AUTOCONF@
< AUTOMAKE = @AUTOMAKE@
< AUTOHEADER = @AUTOHEADER@
<
---
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
49,51c27,29
< INSTALL_PROGRAM = @INSTALL_PROGRAM@
< INSTALL_DATA = @INSTALL_DATA@
< INSTALL_SCRIPT = @INSTALL_SCRIPT@
---
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
53c31
< transform = @program_transform_name@
---
> transform = $(program_transform_name)
60d37
< build_alias = @build_alias@
62d38
< host_alias = @host_alias@
64d39
< target_alias = @target_alias@
65a41,43
> ACLOCAL = @ACLOCAL@
> AMDEP_FALSE = @AMDEP_FALSE@
> AMDEP_TRUE = @AMDEP_TRUE@
67c45,48
< AUTOKEY = @AUTOKEY@
---
> ARLIB_DIR = @ARLIB_DIR@
> AUTOCONF = @AUTOCONF@
> AUTOHEADER = @AUTOHEADER@
> AUTOMAKE = @AUTOMAKE@
69a51
> CCDEPMODE = @CCDEPMODE@
73a56,57
> CPPFLAGS = @CPPFLAGS@
> CYGPATH_W = @CYGPATH_W@
74a59
> DEFS = @DEFS@
75a61,63
> ECHO_C = @ECHO_C@
> ECHO_N = @ECHO_N@
> ECHO_T = @ECHO_T@
77a66
> EGREP = @EGREP@
78a68,70
> INSTALL_DATA = @INSTALL_DATA@
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
> INSTALL_SCRIPT = @INSTALL_SCRIPT@
79a72
> LCRYPTO = @LCRYPTO@
80a74
> LIBOBJS = @LIBOBJS@
82c76
< LIBRSAREF = @LIBRSAREF@
---
> LIBS = @LIBS@
83a78,79
> LTLIBOBJS = @LTLIBOBJS@
> MAKEINFO = @MAKEINFO@
85a82
> MAKE_LIBNTPSIM = @MAKE_LIBNTPSIM@
88c85
< MAKE_LIBRSAREF = @MAKE_LIBRSAREF@
---
> MAKE_NTPDSIM = @MAKE_NTPDSIM@
90c87
< MAKE_NTP_GENKEYS = @MAKE_NTP_GENKEYS@
---
> MAKE_NTP_KEYGEN = @MAKE_NTP_KEYGEN@
91a89
> MAKE_SNTP = @MAKE_SNTP@
98a97,101
> PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
> PACKAGE_NAME = @PACKAGE_NAME@
> PACKAGE_STRING = @PACKAGE_STRING@
> PACKAGE_TARNAME = @PACKAGE_TARNAME@
> PACKAGE_VERSION = @PACKAGE_VERSION@
99a103
> PATH_SEPARATOR = @PATH_SEPARATOR@
103,106c107,110
< RSADIR = @RSADIR@
< RSAOBJS = @RSAOBJS@
< RSAREF = @RSAREF@
< RSASRCS = @RSASRCS@
---
> READLINE_LIBS = @READLINE_LIBS@
> SET_MAKE = @SET_MAKE@
> SHELL = @SHELL@
> STRIP = @STRIP@
109a114,118
> ac_ct_CC = @ac_ct_CC@
> ac_ct_RANLIB = @ac_ct_RANLIB@
> ac_ct_STRIP = @ac_ct_STRIP@
> am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
> am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
110a120
> am__leading_dot = @am__leading_dot@
111a122,136
> bindir = @bindir@
> build = @build@
> build_alias = @build_alias@
> build_cpu = @build_cpu@
> build_os = @build_os@
> build_vendor = @build_vendor@
> datadir = @datadir@
> exec_prefix = @exec_prefix@
> host = @host@
> host_alias = @host_alias@
> host_cpu = @host_cpu@
> host_os = @host_os@
> host_vendor = @host_vendor@
> includedir = @includedir@
> infodir = @infodir@
112a138,153
> libdir = @libdir@
> libexecdir = @libexecdir@
> localstatedir = @localstatedir@
> mandir = @mandir@
> oldincludedir = @oldincludedir@
> prefix = @prefix@
> program_transform_name = @program_transform_name@
> sbindir = @sbindir@
> sharedstatedir = @sharedstatedir@
> subdirs = @subdirs@
> sysconfdir = @sysconfdir@
> target = @target@
> target_alias = @target_alias@
> target_cpu = @target_cpu@
> target_os = @target_os@
> target_vendor = @target_vendor@
113a155
> #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
115a158,160
> EXTRA_PROGRAMS = ntpdc-layout
> EXTRA_DATA = check-layout
> BUILT_SOURCES = maybe-layout
118c163,165
< LDADD = version.o ../libntp/libntp.a @LIBRSAREF@
---
> ntpdc_LDADD = version.o ../libntp/libntp.a @READLINE_LIBS@
> # ntpdc-layout doesn't need any additional libraries at all
> ntpdc_layout_LDADD =
119a167
> CLEANFILES = check-layout layout.here nl.c ntpdc-layout
121c169
< #EXTRA_DIST = ntpdc.mak
---
> EXTRA_DIST = nl_in.c nl.pl layout.std
125a174
> ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
128c177,178
< CONFIG_CLEAN_FILES =
---
> CONFIG_CLEAN_FILES = nl.pl
> EXTRA_PROGRAMS = ntpdc-layout$(EXEEXT)
134d183
< ntpdc_LDADD = $(LDADD)
136a186,189
> ntpdc_layout_SOURCES = ntpdc-layout.c
> ntpdc_layout_OBJECTS = ntpdc-layout$U.$(OBJEXT)
> ntpdc_layout_DEPENDENCIES =
> ntpdc_layout_LDFLAGS =
138d190
< DEFS = @DEFS@
140,142d191
< CPPFLAGS = @CPPFLAGS@
< LDFLAGS = @LDFLAGS@
< LIBS = @LIBS@
144c193,196
< @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/ntpdc$U.Po $(DEPDIR)/ntpdc_ops$U.Po
---
> am__depfiles_maybe = depfiles
> @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ntpdc$U.Po \
> @AMDEP_TRUE@ ./$(DEPDIR)/ntpdc-layout$U.Po \
> @AMDEP_TRUE@ ./$(DEPDIR)/ntpdc_ops$U.Po
149c201
< DIST_SOURCES = $(ntpdc_SOURCES)
---
> DIST_SOURCES = $(ntpdc_SOURCES) ntpdc-layout.c
152,153c204,206
< DIST_COMMON = README $(noinst_HEADERS) Makefile.am Makefile.in
< SOURCES = $(ntpdc_SOURCES)
---
> DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.in \
> Makefile.am nl.pl.in
> SOURCES = $(ntpdc_SOURCES) ntpdc-layout.c
155c208,209
< all: all-am
---
> all: $(BUILT_SOURCES)
> $(MAKE) $(AM_MAKEFLAGS) all-am
163,165c217,220
< cd $(top_builddir) && \
< CONFIG_HEADERS= CONFIG_LINKS= \
< CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
---
> cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
> nl.pl: $(top_builddir)/config.status nl.pl.in
> cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
> binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
173,175c228,230
< f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
< echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
< $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
---
> f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
> echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
> $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
182c237
< f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
---
> f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
191a247,249
> ntpdc-layout$(EXEEXT): $(ntpdc_layout_OBJECTS) $(ntpdc_layout_DEPENDENCIES)
> @rm -f ntpdc-layout$(EXEEXT)
> $(LINK) $(ntpdc_layout_LDFLAGS) $(ntpdc_layout_OBJECTS) $(ntpdc_layout_LDADD) $(LIBS)
204c262
< -rm -f *_.c
---
> -test "$U" = "" || rm -f *_.c
206,207c264,266
< @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntpdc$U.Po@am__quote@
< @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ntpdc_ops$U.Po@am__quote@
---
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntpdc$U.Po@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntpdc-layout$U.Po@am__quote@
> @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntpdc_ops$U.Po@am__quote@
209,211d267
< distclean-depend:
< -rm -rf $(DEPDIR)
<
213,216c269,277
< @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
< @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
< @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
< $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
---
> @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
> @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
> @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
> @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
> @am__fastdepCC_TRUE@ fi
> @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
> @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
219,223c280,288
< @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
< @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
< @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
< $(COMPILE) -c `cygpath -w $<`
< CCDEPMODE = @CCDEPMODE@
---
> @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
> @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
> @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
> @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
> @am__fastdepCC_TRUE@ fi
> @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
> @am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
225c290,292
< $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc.c; then echo $(srcdir)/ntpdc.c; else echo ntpdc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpdc_.c || rm -f ntpdc_.c
---
> $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc.c; then echo $(srcdir)/ntpdc.c; else echo ntpdc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
> ntpdc-layout_.c: ntpdc-layout.c $(ANSI2KNR)
> $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc-layout.c; then echo $(srcdir)/ntpdc-layout.c; else echo ntpdc-layout.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
227,228c294,296
< $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc_ops.c; then echo $(srcdir)/ntpdc_ops.c; else echo ntpdc_ops.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > ntpdc_ops_.c || rm -f ntpdc_ops_.c
< ntpdc_.$(OBJEXT) ntpdc_ops_.$(OBJEXT) : $(ANSI2KNR)
---
> $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntpdc_ops.c; then echo $(srcdir)/ntpdc_ops.c; else echo ntpdc_ops.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
> ntpdc_.$(OBJEXT) ntpdc-layout_.$(OBJEXT) ntpdc_ops_.$(OBJEXT) : \
> $(ANSI2KNR)
230a299,304
> ETAGS = etags
> ETAGSFLAGS =
>
> CTAGS = ctags
> CTAGSFLAGS =
>
234c308
< list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
---
> list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
240c314
< mkid -fID $$unique $(LISP)
---
> mkid -fID $$unique
246c320
< list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \
---
> list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
252,253c326,328
< test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
< || etags $(ETAGS_ARGS) $$tags $$unique $(LISP)
---
> test -z "$(ETAGS_ARGS)$$tags$$unique" \
> || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
> $$tags $$unique
254a330,344
> ctags: CTAGS
> CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
> $(TAGS_FILES) $(LISP)
> tags=; \
> here=`pwd`; \
> list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
> unique=`for i in $$list; do \
> if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
> done | \
> $(AWK) ' { files[$$0] = 1; } \
> END { for (i in files) print i; }'`; \
> test -z "$(CTAGS_ARGS)$$tags$$unique" \
> || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
> $$tags $$unique
>
256c346
< here=`CDPATH=: && cd $(top_builddir) && pwd` \
---
> here=`$(am__cd) $(top_builddir) && pwd` \
261,262c351
< -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
<
---
> -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
269,270c358,365
< @for file in $(DISTFILES); do \
< if test -f $$file; then d=.; else d=$(srcdir); fi; \
---
> @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
> topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
> list='$(DISTFILES)'; for file in $$list; do \
> case $$file in \
> $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
> $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
> esac; \
> if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
273c368,371
< $(mkinstalldirs) "$(distdir)/$$dir"; \
---
> dir="/$$dir"; \
> $(mkinstalldirs) "$(distdir)$$dir"; \
> else \
> dir=''; \
276,277c374,377
< cp -pR $$d/$$file $(distdir) \
< || exit 1; \
---
> if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> fi; \
> cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
285c385,386
< check: check-am
---
> check: $(BUILT_SOURCES)
> $(MAKE) $(AM_MAKEFLAGS) check-am
290,291c391,392
<
< install: install-am
---
> install: $(BUILT_SOURCES)
> $(MAKE) $(AM_MAKEFLAGS) install-am
301a403
> INSTALL_STRIP_FLAG=-s \
306a409
> -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
309c412
< -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
---
> -rm -f $(CONFIG_CLEAN_FILES)
314a418
> -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
319a424,425
> -rm -rf ./$(DEPDIR)
> -rm -f Makefile
321,322c427,428
< distclean-am: clean-am distclean-compile distclean-depend \
< distclean-generic distclean-tags
---
> distclean-am: clean-am distclean-compile distclean-generic \
> distclean-tags
342a449,450
> -rm -rf ./$(DEPDIR)
> -rm -f Makefile
349a458,465
> pdf: pdf-am
>
> pdf-am:
>
> ps: ps-am
>
> ps-am:
>
352,353c468,469
< .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
< clean-generic distclean distclean-compile distclean-depend \
---
> .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
> clean-generic ctags distclean distclean-compile \
360,361c476,477
< mostlyclean-generic mostlyclean-kr tags uninstall uninstall-am \
< uninstall-binPROGRAMS uninstall-info-am
---
> mostlyclean-generic mostlyclean-kr pdf pdf-am ps ps-am tags \
> uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am
363a480,492
> maybe-layout:
> @case "${PATH_PERL}" in \
> /*) ${MAKE} check-layout ;; \
> esac
>
> ntpdc-layout.o: nl.c
>
> layout.here: ntpdc-layout
> ./ntpdc-layout > $@
>
> check-layout: ntpdc-layout layout.std layout.here
> cmp $(srcdir)/layout.std layout.here && echo stamp > $@
>
369c498
< version.o: $(ntpdc_OBJECTS) ../libntp/libntp.a @LIBRSAREF@ Makefile
---
> version.o: $(ntpdc_OBJECTS) ../libntp/libntp.a Makefile $(top_srcdir)/version
371a501,505
>
> # I ran nl_in.c (attached, to be installed into ntpdc) through
> # $(CC) -E nl_in.c | nl.pl > nl.c
> nl.c: nl_in.c nl.pl
> $(CC) -E $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(srcdir)/nl_in.c | ./nl.pl > nl.c