Ignore:
Timestamp:
04/12/99 15:41:33 (25 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
82f490f
Parents:
d115315
Message:

Patch from Ralf Corsepius <corsepiu@…>:

This patch addresses a few minor issues and contains a few (minor)
preparations for automake.

  • configure.in: Fix for handing c/src/tests subdirectory handling (FIX)
  • aclocal/rtems-top.m4: + Add TARGET_SUBDIR and --with-target-subdir (preparation of future

enhancements for cross-compiling)

+ Activate RTEMS_ROOT handling (automake preparation)

  • automake/*.am: replace comments "#" with "##" so that comments won't get included into Makefile.in's anymore
  • c/update-tools/* automake support (NEW)
  • ./autogen update/enhancement (cf. ./autogen for details)

After applying this patch please run:

./autogen
cvs add c/update-tools/configure.in
cvs add c/update-tools/Makefile.am
cvs add c/update-tools/aclocal.m4

Location:
c/src/lib/libbsp/sparc/erc32/tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/sparc/erc32/tools/Makefile.in

    rd115315 r8cdb582  
    1515#
    1616
    17 
    18 # $Id$
    19 
    20 # NOTE: This is a temporary work-around to keep
    21 # "make debug" and "make debug_install" working.
    22 # Once automake is fully integrated these make targets
    23 # and this file will probably be removed
    2417
    2518
     
    7871PACKAGE = @PACKAGE@
    7972PROJECT_ROOT = @PROJECT_ROOT@
     73RTEMS_ROOT = @RTEMS_ROOT@
    8074RTEMS_TOPdir = @RTEMS_TOPdir@
    8175VERSION = @VERSION@
     
    249243debug_install: debug_install-am
    250244
     245.PHONY: debug debug_install debug-am
     246
    251247profile-am:
    252248
     
    257253profile_install: profile_install-am
    258254
    259 .PHONY: debug debug_install profile profile_install
     255.PHONY: profile profile_install profile-am
     256
     257preinstall-am:
     258
     259preinstall: preinstall-am
     260
     261.PHONY: preinstall preinstall-am
    260262
    261263# Tell versions [3.59,3.63) of GNU make to not export all variables.
  • c/src/lib/libbsp/sparc/erc32/tools/aclocal.m4

    rd115315 r8cdb582  
    2020AC_DEFUN(RTEMS_TOP,
    2121[dnl
     22AC_ARG_WITH(target-subdir,
     23[  --with-target-subdir=DIR],
     24TARGET_SUBDIR="$withval",
     25TARGET_SUBDIR=".")
     26
    2227RTEMS_TOPdir="$1";
    2328AC_SUBST(RTEMS_TOPdir)
    2429
    2530PROJECT_ROOT=`pwd`/$RTEMS_TOPdir;
     31test "$TARGET_SUBDIR" = "." || PROJECT_ROOT="$PROJECT_ROOT/.."
    2632AC_SUBST(PROJECT_ROOT)
    2733
     
    4248AC_MSG_RESULT($RTEMS_VERSION)
    4349
    44 dnl FIXME: This once gets activated in future or will be removed
    45 dnl RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir;
    46 dnl AC_SUBST(RTEMS_ROOT)
     50RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir;
     51AC_SUBST(RTEMS_ROOT)
    4752])dnl
    4853
  • c/src/lib/libbsp/sparc/erc32/tools/configure

    rd115315 r8cdb582  
    1212ac_default_prefix=/usr/local
    1313# Any additions from configure.in:
     14ac_help="$ac_help
     15  --with-target-subdir=DIR"
    1416
    1517# Initialize some variables set by options.
     
    542544
    543545
     546# Check whether --with-target-subdir or --without-target-subdir was given.
     547if test "${with_target_subdir+set}" = set; then
     548  withval="$with_target_subdir"
     549  TARGET_SUBDIR="$withval"
     550else
     551  TARGET_SUBDIR="."
     552fi
     553
     554
    544555RTEMS_TOPdir="../../../../../../..";
    545556
    546557
    547558PROJECT_ROOT=`pwd`/$RTEMS_TOPdir;
     559test "$TARGET_SUBDIR" = "." || PROJECT_ROOT="$PROJECT_ROOT/.."
    548560
    549561
    550562echo $ac_n "checking for RTEMS Version""... $ac_c" 1>&6
    551 echo "configure:552: checking for RTEMS Version" >&5
     563echo "configure:564: checking for RTEMS Version" >&5
    552564if test -r "${srcdir}/${RTEMS_TOPdir}/VERSION"; then
    553565RTEMS_VERSION=`grep Version ${srcdir}/${RTEMS_TOPdir}/VERSION | \
     
    560572fi
    561573echo "$ac_t""$RTEMS_VERSION" 1>&6
     574
     575RTEMS_ROOT='$(top_srcdir)'/$RTEMS_TOPdir;
    562576
    563577
     
    590604
    591605echo $ac_n "checking host system type""... $ac_c" 1>&6
    592 echo "configure:593: checking host system type" >&5
     606echo "configure:607: checking host system type" >&5
    593607
    594608host_alias=$host
     
    611625
    612626echo $ac_n "checking target system type""... $ac_c" 1>&6
    613 echo "configure:614: checking target system type" >&5
     627echo "configure:628: checking target system type" >&5
    614628
    615629target_alias=$target
     
    629643
    630644echo $ac_n "checking build system type""... $ac_c" 1>&6
    631 echo "configure:632: checking build system type" >&5
     645echo "configure:646: checking build system type" >&5
    632646
    633647build_alias=$build
     
    654668
    655669echo $ac_n "checking rtems target cpu""... $ac_c" 1>&6
    656 echo "configure:657: checking rtems target cpu" >&5
     670echo "configure:671: checking rtems target cpu" >&5
    657671case "${target}" in
    658672  # hpux unix port should go here
     
    694708# ./install, which can be erroneously created by make from ./install.sh.
    695709echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
    696 echo "configure:697: checking for a BSD compatible install" >&5
     710echo "configure:711: checking for a BSD compatible install" >&5
    697711if test -z "$INSTALL"; then
    698712if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
     
    747761
    748762echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
    749 echo "configure:750: checking whether build environment is sane" >&5
     763echo "configure:764: checking whether build environment is sane" >&5
    750764# Just in case
    751765sleep 1
     
    804818
    805819echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
    806 echo "configure:807: checking whether ${MAKE-make} sets \${MAKE}" >&5
     820echo "configure:821: checking whether ${MAKE-make} sets \${MAKE}" >&5
    807821set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
    808822if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
     
    843857missing_dir=`cd $ac_aux_dir && pwd`
    844858echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
    845 echo "configure:846: checking for working aclocal" >&5
     859echo "configure:860: checking for working aclocal" >&5
    846860# Run test in a subshell; some versions of sh will print an error if
    847861# an executable is not found, even if stderr is redirected.
     
    856870
    857871echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
    858 echo "configure:859: checking for working autoconf" >&5
     872echo "configure:873: checking for working autoconf" >&5
    859873# Run test in a subshell; some versions of sh will print an error if
    860874# an executable is not found, even if stderr is redirected.
     
    869883
    870884echo $ac_n "checking for working automake""... $ac_c" 1>&6
    871 echo "configure:872: checking for working automake" >&5
     885echo "configure:886: checking for working automake" >&5
    872886# Run test in a subshell; some versions of sh will print an error if
    873887# an executable is not found, even if stderr is redirected.
     
    882896
    883897echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
    884 echo "configure:885: checking for working autoheader" >&5
     898echo "configure:899: checking for working autoheader" >&5
    885899# Run test in a subshell; some versions of sh will print an error if
    886900# an executable is not found, even if stderr is redirected.
     
    895909
    896910echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
    897 echo "configure:898: checking for working makeinfo" >&5
     911echo "configure:912: checking for working makeinfo" >&5
    898912# Run test in a subshell; some versions of sh will print an error if
    899913# an executable is not found, even if stderr is redirected.
     
    915929set dummy $ac_prog; ac_word=$2
    916930echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
    917 echo "configure:918: checking for $ac_word" >&5
     931echo "configure:932: checking for $ac_word" >&5
    918932if eval "test \"`echo '$''{'ac_cv_path_KSH'+set}'`\" = set"; then
    919933  echo $ac_n "(cached) $ac_c" 1>&6
     
    11051119s%@RTEMS_TOPdir@%$RTEMS_TOPdir%g
    11061120s%@PROJECT_ROOT@%$PROJECT_ROOT%g
     1121s%@RTEMS_ROOT@%$RTEMS_ROOT%g
    11071122s%@host@%$host%g
    11081123s%@host_alias@%$host_alias%g
Note: See TracChangeset for help on using the changeset viewer.