From aecc1d963c10d7b6d2a8e55b8b9d2750aff99465 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Sun, 20 Jan 2002 16:57:07 +0000 Subject: 2002-01-19 Ralf Corsepius * .cvsignore: Add autom4te.cache, install-sh, mdate-sh, missing, mkinstalldirs, texinfo.tex. * Makefile.am: Add main.am to AUTOMAKE_FILES. * configure.ac: Add AC_CONFIG_AUX_DIR([.]). * project.am: Remove custom .texi and stamp-vti rules. * main.am: Replace TEXI_COMMON with AM_MAKEINFOFLAGS. --- doc/ChangeLog | 9 +++++++++ doc/Makefile.am | 2 +- doc/bootstrap | 2 +- doc/configure.ac | 3 ++- doc/main.am | 2 +- doc/project.am | 18 ------------------ 6 files changed, 14 insertions(+), 22 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index e12f255628..169fa426d7 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,12 @@ +2002-01-19 Ralf Corsepius + + * .cvsignore: Add autom4te.cache, install-sh, mdate-sh, missing, + mkinstalldirs, texinfo.tex. + * Makefile.am: Add main.am to AUTOMAKE_FILES. + * configure.ac: Add AC_CONFIG_AUX_DIR([.]). + * project.am: Remove custom .texi and stamp-vti rules. + * main.am: Replace TEXI_COMMON with AM_MAKEINFOFLAGS. + 2002-01-18 Ralf Corsepius * Makefile.am: Require automake-1.5. diff --git a/doc/Makefile.am b/doc/Makefile.am index 9bead385a0..0d4a2268f3 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -16,7 +16,7 @@ if USE_HTML html_DATA = index.html HELP.html endif -AUTOMAKE_FILES = project.am +AUTOMAKE_FILES = project.am main.am noinst_SCRIPTS = bootstrap diff --git a/doc/bootstrap b/doc/bootstrap index 8dec6f3f52..1841875c2f 100755 --- a/doc/bootstrap +++ b/doc/bootstrap @@ -104,7 +104,7 @@ clean) files=`find . -name 'configure' -print` ; test "$verbose" = "-v" && test -n "$files" && echo "$files" ; for i in $files; do if test -f $i; then - rm -f $i config.guess config.sub depcomp install-sh missing mkinstalldirs + rm -f $i config.guess config.sub depcomp install-sh mdate-sh missing mkinstalldirs test "$verbose" = "-v" && echo "$i" fi; done diff --git a/doc/configure.ac b/doc/configure.ac index d4ed9905a9..c1edad7383 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -4,8 +4,9 @@ AC_PREREQ(2.52) AC_INIT AC_CONFIG_SRCDIR([project.am]) +AC_CONFIG_AUX_DIR([.]) -RTEMS_VERSION=4.5.0-beta3 +RTEMS_VERSION=Snapshot AM_INIT_AUTOMAKE(rtemsdoc,${RTEMS_VERSION},no) AM_MAINTAINER_MODE diff --git a/doc/main.am b/doc/main.am index c3e32ab0c2..ecdd73b032 100644 --- a/doc/main.am +++ b/doc/main.am @@ -1,5 +1,5 @@ TEXINFO_TEX = ../texinfo/texinfo.tex -TEXI_COMMON = -I .. +AM_MAKEINFOFLAGS = -I .. html_projectdir = $(htmldir)/$(PROJECT) diff --git a/doc/project.am b/doc/project.am index 72073557b2..02bfc046fe 100644 --- a/doc/project.am +++ b/doc/project.am @@ -6,24 +6,6 @@ MAINTAINERCLEANFILES = MOSTLYCLEANFILES = CLEANFILES = -## Texinfo support - -.texi: - @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] - cd $(srcdir) && \ - $(MAKEINFO) $(TEXI_COMMON) `echo $< | sed 's,.*/,,'` - -$(srcdir)/stamp-vti: $(PROJECT).texi $(top_srcdir)/configure.ac - @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh \ - $(srcdir)/$(PROJECT).texi`" > vti.tmp - @echo "@set EDITION $(EDITION)" >> vti.tmp - @echo "@set VERSION $(VERSION)" >> vti.tmp - @cmp -s vti.tmp $(srcdir)/version.texi \ - || (echo "Updating $(srcdir)/version.texi"; \ - cp vti.tmp $(srcdir)/version.texi) - -@rm -f vti.tmp - @cp $(srcdir)/version.texi $@ - MAINTAINERCLEANFILES += $(PROJECT) $(PROJECT)-[0-9] $(PROJECT)-[0-9][0-9] MAINTAINERCLEANFILES += $(GENERATED_FILES) -- cgit v1.2.3