diff --git a/ChangeLog b/ChangeLog index 3f0b2a9..d7239f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-12-02 Ben Elliston + + * doc/dejagnu.texi: Add title page and frontmatter. Include + version.texi. + * Makefile.in: Regenerate. + * mdate-sh: Installed by automake --add-missing. + 2018-12-02 Ben Elliston * doc/dejagnu.texi (diff procedure): Tidy up this node. diff --git a/Makefile.in b/Makefile.in index f5a0c8d..9ac3256 100644 --- a/Makefile.in +++ b/Makefile.in @@ -115,7 +115,8 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(include_HEADERS) $(am__DIST_COMMON) + $(am__configure_deps) $(srcdir)/doc/version.texi \ + $(srcdir)/doc/stamp-vti $(include_HEADERS) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -261,7 +262,8 @@ CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in AUTHORS \ COPYING ChangeLog INSTALL NEWS README TODO compile \ - config.guess config.sub depcomp install-sh missing texinfo.tex + config.guess config.sub depcomp install-sh mdate-sh missing \ + texinfo.tex DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -671,7 +673,7 @@ doc/$(am__dirstamp): @$(MKDIR_P) doc @: > doc/$(am__dirstamp) -$(srcdir)/doc/dejagnu.info: doc/dejagnu.texi +$(srcdir)/doc/dejagnu.info: doc/dejagnu.texi $(srcdir)/doc/version.texi $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \ am__cwd=`pwd` && $(am__cd) $(srcdir) && \ rm -rf $$backupdir && mkdir $$backupdir && \ @@ -693,19 +695,19 @@ $(srcdir)/doc/dejagnu.info: doc/dejagnu.texi fi; \ rm -rf $$backupdir; exit $$rc -doc/dejagnu.dvi: doc/dejagnu.texi doc/$(am__dirstamp) +doc/dejagnu.dvi: doc/dejagnu.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp) $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \ $(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \ `test -f 'doc/dejagnu.texi' || echo '$(srcdir)/'`doc/dejagnu.texi -doc/dejagnu.pdf: doc/dejagnu.texi doc/$(am__dirstamp) +doc/dejagnu.pdf: doc/dejagnu.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp) $(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \ $(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \ `test -f 'doc/dejagnu.texi' || echo '$(srcdir)/'`doc/dejagnu.texi -doc/dejagnu.html: doc/dejagnu.texi doc/$(am__dirstamp) +doc/dejagnu.html: doc/dejagnu.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp) $(AM_V_MAKEINFO)rm -rf $(@:.html=.htp) $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \ -o $(@:.html=.htp) `test -f 'doc/dejagnu.texi' || echo '$(srcdir)/'`doc/dejagnu.texi; \ @@ -714,6 +716,27 @@ doc/dejagnu.html: doc/dejagnu.texi doc/$(am__dirstamp) else \ rm -rf $(@:.html=.htp); exit 1; \ fi +$(srcdir)/doc/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/doc/stamp-vti +$(srcdir)/doc/stamp-vti: doc/dejagnu.texi $(top_srcdir)/configure + @test -f doc/$(am__dirstamp) || $(MAKE) $(AM_MAKEFLAGS) doc/$(am__dirstamp) + @(dir=.; test -f ./doc/dejagnu.texi || dir=$(srcdir); \ + set `$(SHELL) $(srcdir)/mdate-sh $$dir/doc/dejagnu.texi`; \ + echo "@set UPDATED $$1 $$2 $$3"; \ + echo "@set UPDATED-MONTH $$2 $$3"; \ + echo "@set EDITION $(VERSION)"; \ + echo "@set VERSION $(VERSION)") > vti.tmp$$$$ && \ + (cmp -s vti.tmp$$$$ $(srcdir)/doc/version.texi \ + || (echo "Updating $(srcdir)/doc/version.texi" && \ + cp vti.tmp$$$$ $(srcdir)/doc/version.texi.tmp$$$$ && \ + mv $(srcdir)/doc/version.texi.tmp$$$$ $(srcdir)/doc/version.texi)) && \ + rm -f vti.tmp$$$$ $(srcdir)/doc/version.texi.$$$$ + @cp $(srcdir)/doc/version.texi $@ + +mostlyclean-vti: + -rm -f vti.tmp* $(srcdir)/doc/version.texi.tmp* + +maintainer-clean-vti: +@MAINTAINER_MODE_TRUE@ -rm -f $(srcdir)/doc/stamp-vti $(srcdir)/doc/version.texi .dvi.ps: $(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ $(DVIPS) $(AM_V_texinfo) -o $@ $< @@ -1393,12 +1416,12 @@ maintainer-clean: maintainer-clean-am -rm -rf testsuite/libdejagnu/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-aminfo \ - maintainer-clean-generic + maintainer-clean-generic maintainer-clean-vti mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \ - mostlyclean-generic + mostlyclean-generic mostlyclean-vti pdf: pdf-am @@ -1434,14 +1457,14 @@ uninstall-man: uninstall-man1 install-pdf install-pdf-am install-pkgdataDATA install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-aminfo \ - maintainer-clean-generic mostlyclean mostlyclean-aminfo \ - mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-baseboardDATA \ - uninstall-binSCRIPTS uninstall-configDATA \ - uninstall-djlibexecSCRIPTS uninstall-dvi-am uninstall-html-am \ - uninstall-includeHEADERS uninstall-info-am uninstall-man \ - uninstall-man1 uninstall-pdf-am uninstall-pkgdataDATA \ - uninstall-ps-am + maintainer-clean-generic maintainer-clean-vti mostlyclean \ + mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ + mostlyclean-vti pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-baseboardDATA uninstall-binSCRIPTS \ + uninstall-configDATA uninstall-djlibexecSCRIPTS \ + uninstall-dvi-am uninstall-html-am uninstall-includeHEADERS \ + uninstall-info-am uninstall-man uninstall-man1 \ + uninstall-pdf-am uninstall-pkgdataDATA uninstall-ps-am .PRECIOUS: Makefile diff --git a/doc/.gitignore b/doc/.gitignore index e9e012b..38f3d6a 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1 +1,3 @@ dejagnu.info +stamp-vti +version.texi diff --git a/doc/dejagnu.texi b/doc/dejagnu.texi index 0dfa037..c31d642 100644 --- a/doc/dejagnu.texi +++ b/doc/dejagnu.texi @@ -1,21 +1,52 @@ -\input texinfo +\input texinfo @c -*- Texinfo -*- @setfilename dejagnu.info @documentencoding us-ascii @settitle DejaGnu -@dircategory Programming +@finalout + +@c man begin INCLUDE +@include version.texi +@c man end + +@copying +@c man begin COPYRIGHT +Copyright @copyright{} 1992-2018 Free Software Foundation, Inc. + +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.3 or +any later version published by the Free Software Foundation; with no +Invariant Sections, with no Front-Cover Texts, and with no Back-Cover +Texts. A copy of the license is included in the section entitled ``GNU +Free Documentation License''. + +@c man end +@end copying + +@dircategory Software development @direntry * DejaGnu: (dejagnu). The GNU testing framework. @end direntry +@titlepage +@title DejaGnu +@ifset VERSION_PACKAGE +@subtitle @value{VERSION_PACKAGE} +@end ifset +@subtitle Version @value{VERSION} +@sp 1 +@subtitle @value{UPDATED} +@author Rob Savoye +@author Cygnus Support +@page + +@vskip 0pt plus 1filll +@insertcopying +@end titlepage +@contents + @node Top, Introduction, , (dir) @top DejaGnu -@ifnottex -This file documents DejaGnu version 1.6.3-git. - -@insertcopying -@end ifnottex - @menu * Introduction:: * Running tests:: diff --git a/mdate-sh b/mdate-sh new file mode 120000 index 0000000..c3446a3 --- /dev/null +++ b/mdate-sh @@ -0,0 +1 @@ +/usr/share/automake-1.15/mdate-sh \ No newline at end of file