From 21e473b0b061fb10d47319ed8607e2b8d1e7efc4 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 18 Jan 2002 15:10:54 +0000 Subject: 2002-01-18 Ralf Corsepius * Makefile.am: Require automake-1.5. * project.am: Reworked. * main.am: New. * configure.ac: New. * configure.in: Removed. * bootstrap: Sync with RTEMS's toplevel bootstrap.sh. --- doc/ChangeLog | 9 +++ doc/Makefile.am | 2 +- doc/bootstrap | 72 +++++++++++------------ doc/configure.ac | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ doc/configure.in | 170 ------------------------------------------------------ doc/main.am | 11 ++++ doc/project.am | 29 ++++------ 7 files changed, 239 insertions(+), 225 deletions(-) create mode 100644 doc/configure.ac delete mode 100644 doc/configure.in create mode 100644 doc/main.am diff --git a/doc/ChangeLog b/doc/ChangeLog index 4ba4818e6e..e12f255628 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,12 @@ +2002-01-18 Ralf Corsepius + + * Makefile.am: Require automake-1.5. + * project.am: Reworked. + * main.am: New. + * configure.ac: New. + * configure.in: Removed. + * bootstrap: Sync with RTEMS's toplevel bootstrap.sh. + 2002-01-17 Joel Sherrill * VERSION: Updated to rtems-doc-ss-20010117. diff --git a/doc/Makefile.am b/doc/Makefile.am index 9184bdb776..9bead385a0 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,7 +2,7 @@ # $Id$ # -AUTOMAKE_OPTIONS = foreign 1.4 +AUTOMAKE_OPTIONS = foreign 1.5 # NOTE: The order of the directories is essential. # + tools, common and images are shared across many documents diff --git a/doc/bootstrap b/doc/bootstrap index 117448e58f..8dec6f3f52 100755 --- a/doc/bootstrap +++ b/doc/bootstrap @@ -5,6 +5,13 @@ # # $Id$ +# this is not meant to be exported outside the source tree + +# NOTE: Inspired by libtool's autogen script + +# to be run from the toplevel directory of RTEMS' +# source tree + progname=`basename $0` top_srcdir=`dirname $0` @@ -26,22 +33,11 @@ usage() exit 1; } -generate() -{ - dir=$1 - amopts=$2 - aclocal_amflags=$3 - - ( test "$quiet" = "true" || echo "$dir"; - cd $dir; - aclocal $aclocal_amflags - autoconf - test -n "`grep CONFIG_HEADER configure.in`" && autoheader ; - test -f Makefile.am && automake $amopts ; - test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \ - && echo timestamp > stamp-h.in - ) -} +if test ! -f $top_srcdir/VERSION; then + echo "${progname}:" + echo " Installation problem: Can't find file VERSION" + exit 1; +fi while test $# -gt 0; do case $1 in @@ -65,33 +61,38 @@ done case $mode in generate) - + case $top_srcdir in - /* ) aclocal_dir=$top_srcdir/aclocal + /* ) aclocal_dir=$top_srcdir ;; - *) aclocal_dir=`pwd`/$top_srcdir/aclocal + *) aclocal_dir=`pwd`/$top_srcdir ;; esac - if test -d $aclocal_dir; then - aclocal_amflags="-I $aclocal_dir" - fi - confs=`find . -name 'configure.in' -print | sort` + confs=`find . \( -name 'configure.in' -o -name 'configure.ac' \) -print` for i in $confs; do - dir=`dirname $i`; - generate $dir "-a $verbose" "$aclocal_amflags"; + dir=`dirname $i`; + configure=`basename $i`; + ( test "$quiet" = "true" || echo "$dir"; + cd $dir; + pat="s,\$(RTEMS_TOPdir),${aclocal_dir},g" + aclocal_args=`grep '^[ ]*ACLOCAL_AMFLAGS' Makefile.am | \ + sed -e 's%.*ACLOCAL_AMFLAGS.*\=[ ]*%%g' -e $pat ` ; + test "$verbose" = "-v" && echo "aclocal $aclocal_args" + aclocal $aclocal_args; + test -n "`grep CONFIG_HEADER ${configure}`" && autoheader \ + && test "$verbose" = "-v" && echo "autoheader"; + test -n "`grep RTEMS_BSP_CONFIGURE ${configure}`" && autoheader \ + && test "$verbose" = "-v" && echo "autoheader"; + test -f Makefile.am && automake -a -c $verbose ; + autoconf; + test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \ + && echo timestamp > stamp-h.in + ) done ;; clean) - test "$quiet" = "$true" || echo "removing automake support files" - find . -name 'config.guess' -print | xargs rm -f - find . -name 'config.sub' -print | xargs rm -f - find . -name 'install-sh' -print | xargs rm -f - find . -name 'missing' -print | xargs rm -f - find . -name 'mkinstalldirs' -print | xargs rm -f - find . -name 'mdate-sh' -print | xargs rm -f - test "$quiet" = "true" || echo "removing automake generated Makefile.in files" files=`find . -name 'Makefile.am' -print | sed -e 's%\.am%\.in%g'` ; for i in $files; do if test -f $i; then @@ -103,8 +104,8 @@ 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 - test "$verbose" = "-v" && echo "$i" + rm -f $i config.guess config.sub depcomp install-sh missing mkinstalldirs + test "$verbose" = "-v" && echo "$i" fi; done test "$quiet" = "true" || echo "removing aclocal.m4 files" @@ -116,6 +117,7 @@ clean) fi; done find . -name '*~' -print | xargs rm -f + find . -name 'bspopts.h*' -print | xargs rm -f find . -name '*.orig' -print | xargs rm -f find . -name '*.rej' -print | xargs rm -f find . -name 'config.status' -print | xargs rm -f diff --git a/doc/configure.ac b/doc/configure.ac new file mode 100644 index 0000000000..d4ed9905a9 --- /dev/null +++ b/doc/configure.ac @@ -0,0 +1,171 @@ +dnl Process this file with autoconf to produce a configure script. + +AC_PREREQ(2.52) + +AC_INIT +AC_CONFIG_SRCDIR([project.am]) + +RTEMS_VERSION=4.5.0-beta3 + +AM_INIT_AUTOMAKE(rtemsdoc,${RTEMS_VERSION},no) +AM_MAINTAINER_MODE + +AC_ARG_ENABLE(html, +[ --disable-html disable html support ], +[case $enableval in +yes) ;; +no) ;; +*) AC_MSG_ERROR("invalid value");; +esac], +[enable_html="yes"] +) + +AC_ARG_ENABLE(dvi, +[ --disable-dvi disable dvi support ], +[case $enableval in +yes) ;; +no) ;; +*) AC_MSG_ERROR("invalid value");; +esac], +[enable_dvi="yes"] +) + +AC_ARG_ENABLE(pdf, +[ --disable-pdf disable pdf support ], +[case $enableval in +yes) ;; +no) ;; +*) AC_MSG_ERROR("invalid value");; +esac], +[enable_pdf="yes"] +) + +AC_ARG_ENABLE(ps, +[ --disable-ps disable ps support ], +[case $enableval in +yes) ;; +no) ;; +*) AC_MSG_ERROR("invalid value");; +esac], +[enable_ps="yes"] +) + +AC_ARG_ENABLE(papersize, +[ --enable-papersize=[letter|a4|] set papersize [default:system defaults]], +[case $enableval in +a4) papersize=a4 ;; +letter) papersize=letter ;; +yes) papersize= ;; +no) papersize= ;; +*) AC_MSG_ERROR([Invalid papersize]) +;; +esac], +[papersize=] +) + +htmldir='$(pkgdatadir)/html' +AC_SUBST(htmldir) + +dnl Checks for programs. +AC_PROG_LN_S + +AC_CHECK_PROGS(PERL,perl) + +TEXI2WWW='$(PERL) $(top_srcdir)/tools/texi2www/texi2www' +AC_SUBST(TEXI2WWW) + +AC_CHECK_PROGS(GS,gs) +AM_CONDITIONAL(GS,test x"$GS" != x"") + +AC_CHECK_PROGS(TEXI2DVI,texi2dvi) +AM_CONDITIONAL(TEXI2DVI,test x"$TEXI2DVI" != x"") +if test "$enable_pdf" = "yes"; then + AC_CHECK_PROGS(EPSTOPDF,epstopdf) + AM_CONDITIONAL(EPSTOPDF,test x"$EPSTOPDF" != x"") + + AC_CHECK_PROGS(TEXI2PDF,texi2pdf) + AM_CONDITIONAL(TEXI2PDF,test x"$TEXI2PDF" != x"") +fi + +AM_CONDITIONAL(USE_HTML, + test "$enable_html" = "yes" \ + && test x"PERL" != x"" ) + +AM_CONDITIONAL(USE_DVI, + test "$enable_dvi" = "yes" \ + && test x"$TEXI2DVI" != x"" ) + +AM_CONDITIONAL(USE_PS, + test "$enable_ps" = "yes" \ + && test x"$TEXI2DVI" != x"" ) + +AM_CONDITIONAL(USE_PDF, + test "$enable_pdf" = "yes" \ + && test x"$TEXI2DVI" != x"" \ + && test x"$TEXI2PDF" != x"" ) + +case $papersize in +a4) + TEXI2DVI="${TEXI2DVI} --texinfo=@afourpaper" + TEXI2PDF="${TEXI2PDF} --texinfo=@afourpaper" + DVIPS="dvips -t a4" +;; +letter) + DVIPS="dvips -t letter" + ;; +*) + DVIPS="dvips" +;; +esac +AC_SUBST(DVIPS) + +BMENU2='$(top_builddir)/tools/bmenu/bmenu2' +AC_SUBST(BMENU2) + +dnl Checks for libraries. + +dnl Checks for header files. + +dnl Checks for typedefs, structures, and compiler characteristics. + +dnl Checks for library functions. + +AC_CONFIG_SUBDIRS(tools) + +AC_CONFIG_FILES([Makefile +rtems_support.html +index.html +images/Makefile +common/Makefile +FAQ/Makefile +develenv/Makefile +user/Makefile +bsp_howto/Makefile +started/Makefile +started/pictures/Makefile +porting/Makefile +networking/Makefile +posix_users/Makefile +posix1003.1/Makefile +filesystem/Makefile +itron3.0/Makefile +ada_user/Makefile +started_ada/Makefile +rtems_gdb/Makefile +rgdb_specs/Makefile +relnotes/Makefile +new_chapters/Makefile +supplements/Makefile +supplements/hppa1_1/Makefile +supplements/i386/Makefile +supplements/i960/Makefile +supplements/m68k/Makefile +supplements/mips64orion/Makefile +supplements/powerpc/Makefile +supplements/sh/Makefile +supplements/sparc/Makefile +supplements/template/Makefile +gnu_docs/Makefile +src2html/Makefile +]) +AC_OUTPUT diff --git a/doc/configure.in b/doc/configure.in deleted file mode 100644 index add8dd4a5b..0000000000 --- a/doc/configure.in +++ /dev/null @@ -1,170 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.13) - -AC_INIT(project.am) - -RTEMS_VERSION=eng-20010816b - -AM_INIT_AUTOMAKE(rtemsdoc,${RTEMS_VERSION},no) -AM_MAINTAINER_MODE - -AC_ARG_ENABLE(html, -[ --disable-html disable html support ], -[case $enableval in -yes) ;; -no) ;; -*) AC_MSG_ERROR("invalid value");; -esac], -[enable_html="yes"] -) - -AC_ARG_ENABLE(dvi, -[ --disable-dvi disable dvi support ], -[case $enableval in -yes) ;; -no) ;; -*) AC_MSG_ERROR("invalid value");; -esac], -[enable_dvi="yes"] -) - -AC_ARG_ENABLE(pdf, -[ --disable-pdf disable pdf support ], -[case $enableval in -yes) ;; -no) ;; -*) AC_MSG_ERROR("invalid value");; -esac], -[enable_pdf="yes"] -) - -AC_ARG_ENABLE(ps, -[ --disable-ps disable ps support ], -[case $enableval in -yes) ;; -no) ;; -*) AC_MSG_ERROR("invalid value");; -esac], -[enable_ps="yes"] -) - -AC_ARG_ENABLE(papersize, -[ --enable-papersize=[letter|a4|] set papersize [default:system defaults]], -[case $enableval in -a4) papersize=a4 ;; -letter) papersize=letter ;; -yes) papersize= ;; -no) papersize= ;; -*) AC_MSG_ERROR([Invalid papersize]) -;; -esac], -[papersize=] -) - -htmldir='$(pkgdatadir)/html' -AC_SUBST(htmldir) - -dnl Checks for programs. -AC_PROG_LN_S - -AC_CHECK_PROGS(PERL,perl) - -TEXI2WWW='$(PERL) $(top_srcdir)/tools/texi2www/texi2www' -AC_SUBST(TEXI2WWW) - -AC_CHECK_PROGS(GS,gs) -AM_CONDITIONAL(GS,test x"$GS" != x"") - -AC_CHECK_PROGS(TEXI2DVI,texi2dvi) -AM_CONDITIONAL(TEXI2DVI,test x"$TEXI2DVI" != x"") -if test "$enable_pdf" = "yes"; then - AC_CHECK_PROGS(EPSTOPDF,epstopdf) - AM_CONDITIONAL(EPSTOPDF,test x"$EPSTOPDF" != x"") - - AC_CHECK_PROGS(TEXI2PDF,texi2pdf) - AM_CONDITIONAL(TEXI2PDF,test x"$TEXI2PDF" != x"") -fi - -AM_CONDITIONAL(USE_HTML, - test "$enable_html" = "yes" \ - && test x"PERL" != x"" ) - -AM_CONDITIONAL(USE_DVI, - test "$enable_dvi" = "yes" \ - && test x"$TEXI2DVI" != x"" ) - -AM_CONDITIONAL(USE_PS, - test "$enable_ps" = "yes" \ - && test x"$TEXI2DVI" != x"" ) - -AM_CONDITIONAL(USE_PDF, - test "$enable_pdf" = "yes" \ - && test x"$TEXI2DVI" != x"" \ - && test x"$TEXI2PDF" != x"" ) - -case $papersize in -a4) - TEXI2DVI="${TEXI2DVI} --texinfo=@afourpaper" - TEXI2PDF="${TEXI2PDF} --texinfo=@afourpaper" - DVIPS="dvips -t a4" -;; -letter) - DVIPS="dvips -t letter" - ;; -*) - DVIPS="dvips" -;; -esac -AC_SUBST(DVIPS) - -BMENU2='$(top_builddir)/tools/bmenu/bmenu2' -AC_SUBST(BMENU2) - -dnl Checks for libraries. - -dnl Checks for header files. - -dnl Checks for typedefs, structures, and compiler characteristics. - -dnl Checks for library functions. - -AC_CONFIG_SUBDIRS(tools) - -AC_OUTPUT( -Makefile -rtems_support.html -index.html -images/Makefile -common/Makefile -FAQ/Makefile -develenv/Makefile -user/Makefile -bsp_howto/Makefile -started/Makefile -started/pictures/Makefile -porting/Makefile -networking/Makefile -posix_users/Makefile -posix1003.1/Makefile -filesystem/Makefile -itron3.0/Makefile -ada_user/Makefile -started_ada/Makefile -rtems_gdb/Makefile -rgdb_specs/Makefile -relnotes/Makefile -new_chapters/Makefile -supplements/Makefile -supplements/hppa1_1/Makefile -supplements/i386/Makefile -supplements/i960/Makefile -supplements/m68k/Makefile -supplements/mips64orion/Makefile -supplements/powerpc/Makefile -supplements/sh/Makefile -supplements/sparc/Makefile -supplements/template/Makefile -gnu_docs/Makefile -src2html/Makefile -) diff --git a/doc/main.am b/doc/main.am new file mode 100644 index 0000000000..c3e32ab0c2 --- /dev/null +++ b/doc/main.am @@ -0,0 +1,11 @@ +TEXINFO_TEX = ../texinfo/texinfo.tex +TEXI_COMMON = -I .. + +html_projectdir = $(htmldir)/$(PROJECT) + +TEXI2WWW_ARGS=\ +-I $(srcdir) -I $(top_srcdir) \ +-dirfile ../index.html \ +-header rtems_header.html \ +-footer rtems_footer.html \ +-icons ../images diff --git a/doc/project.am b/doc/project.am index 5265639606..72073557b2 100644 --- a/doc/project.am +++ b/doc/project.am @@ -1,18 +1,19 @@ ## $Id$ -SUFFIXES += .t +SUFFIXES = .t + +MAINTAINERCLEANFILES = +MOSTLYCLEANFILES = +CLEANFILES = ## Texinfo support -TEXINFO_TEX = ../texinfo/texinfo.tex -## TEXINPUTS = $(srcdir):$(top_srcdir) -TEXI_COMMON = -I .. .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.in +$(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 @@ -55,16 +56,6 @@ MOSTLYCLEANFILES += $(PDF_IMAGES) ## HTML SUFFIXES += .html -html_projectdir = $(htmldir)/$(PROJECT) - -TEXI2WWW_ARGS=\ --I $(srcdir) \ --I $(top_srcdir) \ --dirfile ../index.html \ --header rtems_header.html \ --footer rtems_footer.html \ --icons $(top_builddir)/images - rtems_header.html: $(top_srcdir)/rtems_header.html.in version.texi @sed -e s%\.\./images/%$(top_builddir)/images/%g \ -e s%\@VERSION\@%@VERSION@%g \ @@ -83,17 +74,17 @@ MOSTLYCLEANFILES += index.html $(PROJECT)*.html rtems_header.html \ ## Common installation points if USE_HTML -html_project_DATA += index.html $(PROJECT)*.html +html_project_DATA = index.html $(PROJECT)*.html endif if USE_DVI -dvi_DATA += $(PROJECT).dvi +dvi_DATA = $(PROJECT).dvi .texi.dvi: $(TEXI2DVI) -q -I $(srcdir) -I $(top_srcdir) $< if USE_PS -ps_DATA += $(PROJECT).ps +ps_DATA = $(PROJECT).ps .dvi.ps: TEXINPUTS=$(srcdir):$$TEXINPUTS \ $(DVIPS) $< -o $@ @@ -102,7 +93,7 @@ endif # USE_PS endif # USE_DVI if USE_PDF -pdf_DATA += $(PROJECT).pdf +pdf_DATA = $(PROJECT).pdf if TEXI2PDF .texi.pdf: -- cgit v1.2.3