Changeset 21e473b in rtems


Ignore:
Timestamp:
Jan 18, 2002, 3:10:54 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
5802d12
Parents:
1615cf12
Message:

2002-01-18 Ralf Corsepius <corsepiu@…>

  • 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.
Location:
doc
Files:
1 added
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • doc/ChangeLog

    r1615cf12 r21e473b  
     12002-01-18      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Require automake-1.5.
     4        * project.am: Reworked.
     5        * main.am: New.
     6        * configure.ac: New.
     7        * configure.in: Removed.
     8        * bootstrap: Sync with RTEMS's toplevel bootstrap.sh.
     9
    1102002-01-17      Joel Sherrill <joel@OARcorp.com>
    211
  • doc/Makefile.am

    r1615cf12 r21e473b  
    33#
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66
    77# NOTE: The order of the directories is essential.
  • doc/bootstrap

    r1615cf12 r21e473b  
    55#
    66# $Id$
     7
     8# this is not meant to be exported outside the source tree
     9
     10# NOTE: Inspired by libtool's autogen script
     11
     12# to be run from the toplevel directory of RTEMS'
     13# source tree
    714
    815progname=`basename $0`
     
    2734}
    2835
    29 generate()
    30 {
    31   dir=$1
    32   amopts=$2
    33   aclocal_amflags=$3
    34 
    35   ( test "$quiet" = "true" || echo "$dir";
    36     cd $dir;
    37     aclocal $aclocal_amflags
    38     autoconf
    39     test -n "`grep CONFIG_HEADER configure.in`" && autoheader ;
    40     test -f Makefile.am && automake $amopts ;
    41     test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \
    42       && echo timestamp > stamp-h.in
    43   )
    44 }
     36if test ! -f $top_srcdir/VERSION; then
     37  echo "${progname}:"
     38  echo "        Installation problem: Can't find file VERSION"
     39  exit 1;
     40fi
    4541
    4642while test $# -gt 0; do
     
    6662case $mode in
    6763generate)
    68  
     64
    6965  case $top_srcdir in
    70   /* ) aclocal_dir=$top_srcdir/aclocal
     66  /* ) aclocal_dir=$top_srcdir
    7167    ;;
    72   *) aclocal_dir=`pwd`/$top_srcdir/aclocal
     68  *) aclocal_dir=`pwd`/$top_srcdir
    7369    ;;
    7470  esac
    75   if test -d $aclocal_dir; then
    76     aclocal_amflags="-I $aclocal_dir"
    77   fi
    7871
    79   confs=`find . -name 'configure.in' -print | sort`
     72  confs=`find . \( -name 'configure.in' -o -name 'configure.ac' \) -print`
    8073  for i in $confs; do
    81     dir=`dirname $i`;
    82     generate $dir "-a $verbose" "$aclocal_amflags";
     74  dir=`dirname $i`;
     75  configure=`basename $i`;
     76  ( test "$quiet" = "true" || echo "$dir";
     77    cd $dir;
     78    pat="s,\$(RTEMS_TOPdir),${aclocal_dir},g"
     79    aclocal_args=`grep '^[ ]*ACLOCAL_AMFLAGS' Makefile.am | \
     80      sed -e 's%.*ACLOCAL_AMFLAGS.*\=[ ]*%%g' -e $pat ` ;
     81    test "$verbose" = "-v" && echo "aclocal $aclocal_args"
     82    aclocal $aclocal_args;
     83    test -n "`grep CONFIG_HEADER ${configure}`" && autoheader \
     84      && test "$verbose" = "-v" && echo "autoheader";
     85    test -n "`grep RTEMS_BSP_CONFIGURE ${configure}`" && autoheader \
     86      && test "$verbose" = "-v" && echo "autoheader";
     87    test -f Makefile.am && automake -a -c $verbose ;
     88    autoconf;
     89    test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \
     90      && echo timestamp > stamp-h.in
     91  )
    8392  done
    8493  ;;
    8594
    8695clean)
    87   test "$quiet" = "$true" || echo "removing automake support files"
    88   find . -name 'config.guess' -print | xargs rm -f
    89   find . -name 'config.sub' -print | xargs rm -f
    90   find . -name 'install-sh' -print | xargs rm -f
    91   find . -name 'missing' -print | xargs rm -f
    92   find . -name 'mkinstalldirs' -print | xargs rm -f
    93   find . -name 'mdate-sh' -print | xargs rm -f
    94 
    9596  test "$quiet" = "true" || echo "removing automake generated Makefile.in files"
    9697  files=`find . -name 'Makefile.am' -print | sed -e 's%\.am%\.in%g'` ;
     
    104105  test "$verbose" = "-v" && test -n "$files" && echo "$files" ;
    105106  for i in $files; do if test -f $i; then
    106     rm -f $i
    107     test "$verbose" = "-v" && echo "$i"
     107    rm -f $i config.guess config.sub depcomp install-sh missing mkinstalldirs
     108    test "$verbose" = "-v" && echo "$i"   
    108109  fi; done
    109110 
     
    117118
    118119  find . -name '*~' -print | xargs rm -f
     120  find . -name 'bspopts.h*' -print | xargs rm -f
    119121  find . -name '*.orig' -print | xargs rm -f
    120122  find . -name '*.rej' -print | xargs rm -f
  • doc/configure.ac

    r1615cf12 r21e473b  
    11dnl Process this file with autoconf to produce a configure script.
    22
    3 AC_PREREQ(2.13)
     3AC_PREREQ(2.52)
    44
    5 AC_INIT(project.am)
     5AC_INIT
     6AC_CONFIG_SRCDIR([project.am])
    67
    7 RTEMS_VERSION=eng-20010816b
     8RTEMS_VERSION=4.5.0-beta3
    89
    910AM_INIT_AUTOMAKE(rtemsdoc,${RTEMS_VERSION},no)
     
    132133AC_CONFIG_SUBDIRS(tools)
    133134
    134 AC_OUTPUT(
    135 Makefile
     135AC_CONFIG_FILES([Makefile
    136136rtems_support.html
    137137index.html
     
    168168gnu_docs/Makefile
    169169src2html/Makefile
    170 )
     170])
     171AC_OUTPUT
  • doc/project.am

    r1615cf12 r21e473b  
    11## $Id$
    22
    3 SUFFIXES += .t
     3SUFFIXES = .t
     4
     5MAINTAINERCLEANFILES =
     6MOSTLYCLEANFILES =
     7CLEANFILES =
    48
    59## Texinfo support
    6 TEXINFO_TEX = ../texinfo/texinfo.tex
    7 ## TEXINPUTS = $(srcdir):$(top_srcdir)
    8 TEXI_COMMON = -I ..
    910
    1011.texi:
     
    1314          $(MAKEINFO) $(TEXI_COMMON) `echo $< | sed 's,.*/,,'`
    1415
    15 $(srcdir)/stamp-vti: $(PROJECT).texi $(top_srcdir)/configure.in
     16$(srcdir)/stamp-vti: $(PROJECT).texi $(top_srcdir)/configure.ac
    1617        @echo "@set UPDATED `$(SHELL) $(srcdir)/mdate-sh \
    1718          $(srcdir)/$(PROJECT).texi`" > vti.tmp
     
    5657SUFFIXES += .html
    5758
    58 html_projectdir = $(htmldir)/$(PROJECT)
    59 
    60 TEXI2WWW_ARGS=\
    61 -I $(srcdir) \
    62 -I $(top_srcdir) \
    63 -dirfile ../index.html \
    64 -header rtems_header.html \
    65 -footer rtems_footer.html \
    66 -icons $(top_builddir)/images
    67 
    6859rtems_header.html: $(top_srcdir)/rtems_header.html.in version.texi
    6960        @sed -e s%\.\./images/%$(top_builddir)/images/%g \
     
    8475## Common installation points
    8576if USE_HTML
    86 html_project_DATA += index.html $(PROJECT)*.html
     77html_project_DATA = index.html $(PROJECT)*.html
    8778endif
    8879
    8980if USE_DVI
    90 dvi_DATA += $(PROJECT).dvi
     81dvi_DATA = $(PROJECT).dvi
    9182
    9283.texi.dvi:
     
    9485
    9586if USE_PS
    96 ps_DATA += $(PROJECT).ps
     87ps_DATA = $(PROJECT).ps
    9788.dvi.ps:
    9889        TEXINPUTS=$(srcdir):$$TEXINPUTS \
     
    10394
    10495if USE_PDF
    105 pdf_DATA += $(PROJECT).pdf
     96pdf_DATA = $(PROJECT).pdf
    10697
    10798if TEXI2PDF
Note: See TracChangeset for help on using the changeset viewer.