2002-01-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* .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.
This commit is contained in:
Joel Sherrill
2002-01-20 16:57:07 +00:00
parent fa49393ba4
commit aecc1d963c
6 changed files with 14 additions and 22 deletions

View File

@@ -1,3 +1,12 @@
2002-01-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* .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 <corsepiu@faw.uni-ulm.de> 2002-01-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Require automake-1.5. * Makefile.am: Require automake-1.5.

View File

@@ -16,7 +16,7 @@ if USE_HTML
html_DATA = index.html HELP.html html_DATA = index.html HELP.html
endif endif
AUTOMAKE_FILES = project.am AUTOMAKE_FILES = project.am main.am
noinst_SCRIPTS = bootstrap noinst_SCRIPTS = bootstrap

View File

@@ -104,7 +104,7 @@ clean)
files=`find . -name 'configure' -print` ; files=`find . -name 'configure' -print` ;
test "$verbose" = "-v" && test -n "$files" && echo "$files" ; test "$verbose" = "-v" && test -n "$files" && echo "$files" ;
for i in $files; do if test -f $i; then 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" test "$verbose" = "-v" && echo "$i"
fi; done fi; done

View File

@@ -4,8 +4,9 @@ AC_PREREQ(2.52)
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([project.am]) 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_INIT_AUTOMAKE(rtemsdoc,${RTEMS_VERSION},no)
AM_MAINTAINER_MODE AM_MAINTAINER_MODE

View File

@@ -1,5 +1,5 @@
TEXINFO_TEX = ../texinfo/texinfo.tex TEXINFO_TEX = ../texinfo/texinfo.tex
TEXI_COMMON = -I .. AM_MAKEINFOFLAGS = -I ..
html_projectdir = $(htmldir)/$(PROJECT) html_projectdir = $(htmldir)/$(PROJECT)

View File

@@ -6,24 +6,6 @@ MAINTAINERCLEANFILES =
MOSTLYCLEANFILES = MOSTLYCLEANFILES =
CLEANFILES = 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 += $(PROJECT) $(PROJECT)-[0-9] $(PROJECT)-[0-9][0-9]
MAINTAINERCLEANFILES += $(GENERATED_FILES) MAINTAINERCLEANFILES += $(GENERATED_FILES)