Changeset 22afde51 in rtems


Ignore:
Timestamp:
10/24/01 23:50:01 (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
bfbe811
Parents:
2ed1563
Message:

2001-10-23 Ralf Corsepius <corsepiu@…>

  • aclocal.m4: Regenerated.
  • configure.ac, include/Makefile.am, irq/Makefile.am, vectors/Makefile.am: Updated to autoconf 2.52.
  • include/.cvsignore: Added newly generated files.
  • include/bsp.h: Added include of bspopts.h.
Location:
c/src/lib/libbsp/powerpc/mpc8260ads
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog

    r2ed1563 r22afde51  
     12001-10-23      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * aclocal.m4: Regenerated.
     4        * configure.ac, include/Makefile.am, irq/Makefile.am,
     5        vectors/Makefile.am: Updated to autoconf 2.52.
     6        * include/.cvsignore: Added newly generated files.
     7        * include/bsp.h: Added include of bspopts.h.
     8
    192001-10-22      Joel Sherrill <joel@OARcorp.com>
    210

  • c/src/lib/libbsp/powerpc/mpc8260ads/aclocal.m4

    r2ed1563 r22afde51  
    774774dnl $Id$
    775775
    776 AC_DEFUN(RTEMS_ENABLE_NETWORKING,
    777 [
    778 
    779 AC_ARG_ENABLE(networking,
    780 AC_HELP_STRING([--enable-networking],[enable TCP/IP stack]),
    781 [case "${enableval}" in
    782   yes) RTEMS_HAS_NETWORKING=yes ;;
    783   no) RTEMS_HAS_NETWORKING=no ;;
    784   *)  AC_MSG_ERROR(bad value ${enableval} for enable-networking option) ;;
    785 esac],[RTEMS_HAS_NETWORKING=yes])
    786 AC_SUBST(RTEMS_HAS_NETWORKING)dnl
    787 ])
    788 
    789 dnl $Id$
    790 
    791776dnl Pass a single BSP via an environment variable
    792777dnl used by per BSP configure scripts
    … …  
    985970
    986971dnl $Id$
    987 dnl
    988 AC_DEFUN(RTEMS_CHECK_NETWORKING,
    989 [dnl
    990 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
    991 AC_REQUIRE([RTEMS_ENABLE_NETWORKING])dnl
    992 
    993 AC_CACHE_CHECK([whether BSP supports networking],
    994   rtems_cv_HAS_NETWORKING,
    995   [dnl
    996     case "$RTEMS_CPU" in
    997     unix*)
    998       rtems_cv_HAS_NETWORKING="no"
    999       ;;
    1000     *)
    1001       if test "${RTEMS_HAS_NETWORKING}" = "yes"; then
    1002         rtems_cv_HAS_NETWORKING="yes";
    1003       else
    1004         rtems_cv_HAS_NETWORKING="disabled";
    1005       fi
    1006       ;;
    1007     esac])
    1008 if test "$rtems_cv_HAS_NETWORKING" = "yes"; then
    1009   HAS_NETWORKING="yes";
    1010 else
    1011   HAS_NETWORKING="no";
    1012 fi
    1013 AC_SUBST(HAS_NETWORKING)dnl
    1014 ])
    1015 
    1016 dnl $Id$
    1017972
    1018973AC_DEFUN(RTEMS_CANONICAL_HOST,
    … …  
    1040995])dnl
    1041996
     997# Like AC_CONFIG_HEADER, but automatically create stamp file.
     998
     999# serial 3
     1000
     1001# When config.status generates a header, we must update the stamp-h file.
     1002# This file resides in the same directory as the config header
     1003# that is generated.  We must strip everything past the first ":",
     1004# and everything past the last "/".
     1005
     1006AC_PREREQ([2.12])
     1007
     1008AC_DEFUN([AM_CONFIG_HEADER],
     1009[ifdef([AC_FOREACH],dnl
     1010         [dnl init our file count if it isn't already
     1011         m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
     1012         dnl prepare to store our destination file list for use in config.status
     1013         AC_FOREACH([_AM_File], [$1],
     1014                    [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
     1015                    m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
     1016                    dnl and add it to the list of files AC keeps track of, along
     1017                    dnl with our hook
     1018                    AC_CONFIG_HEADERS(_AM_File,
     1019dnl COMMANDS, [, INIT-CMDS]
     1020[# update the timestamp
     1021echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index["
     1022][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS
     1023                    m4_popdef([_AM_Dest])])],dnl
     1024[AC_CONFIG_HEADER([$1])
     1025  AC_OUTPUT_COMMANDS(
     1026   ifelse(patsubst([$1], [[^ ]], []),
     1027          [],
     1028          [test -z "$CONFIG_HEADERS" || echo timestamp >dnl
     1029           patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl
     1030[am_indx=1
     1031for am_file in $1; do
     1032  case " \$CONFIG_HEADERS " in
     1033  *" \$am_file "*)
     1034    am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\`
     1035    if test -n "\$am_dir"; then
     1036      am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\`
     1037      for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do
     1038        am_tmpdir=\$am_tmpdir\$am_subdir/
     1039        if test ! -d \$am_tmpdir; then
     1040          mkdir \$am_tmpdir
     1041        fi
     1042      done
     1043    fi
     1044    echo timestamp > "\$am_dir"stamp-h\$am_indx
     1045    ;;
     1046  esac
     1047  am_indx=\`expr \$am_indx + 1\`
     1048done])
     1049])]) # AM_CONFIG_HEADER
     1050
     1051# _AM_DIRNAME(PATH)
     1052# -----------------
     1053# Like AS_DIRNAME, only do it during macro expansion
     1054AC_DEFUN([_AM_DIRNAME],
     1055       [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
     1056              m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
     1057                    m4_if(m4_regexp([$1], [^/.*]), -1,
     1058                          [.],
     1059                          m4_patsubst([$1], [^\(/\).*], [\1])),
     1060                    m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
     1061              m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
     1062]) # _AM_DIRNAME
     1063

  • c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac

    r2ed1563 r22afde51  
    33## $Id$
    44
    5 AC_PREREQ(2.13)
    6 AC_INIT(bsp_specs)
     5AC_PREREQ(2.52)
     6AC_INIT
     7AC_CONFIG_SRCDIR([bsp_specs])
    78RTEMS_TOP(../../../../../..)
    89AC_CONFIG_AUX_DIR(../../../../../..)
    … …  
    1213AM_MAINTAINER_MODE
    1314
    14 RTEMS_PROG_CC_FOR_TARGET
     15RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm])
    1516RTEMS_CANONICALIZE_TOOLS
    16 RTEMS_ENABLE_LIBCDIR
    17 RTEMS_ENABLE_NETWORKING
    1817
    1918RTEMS_ENV_RTEMSBSP
    2019RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    2120RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
    22 RTEMS_CHECK_NETWORKING
    2321RTEMS_CANONICAL_HOST
     22
     23AM_CONFIG_HEADER(include/bspopts.h)
    2424
    2525RTEMS_PROJECT_ROOT
    … …  
    2727
    2828# Explicitly list a Makefile here
    29 AC_OUTPUT(
    30 Makefile
     29AC_CONFIG_FILES([Makefile
    3130clock/Makefile
    3231console/Makefile
    … …  
    3736start/Makefile
    3837startup/Makefile
    39 wrapup/Makefile)
     38wrapup/Makefile])
     39AC_OUTPUT

  • c/src/lib/libbsp/powerpc/mpc8260ads/include/.cvsignore

    r2ed1563 r22afde51  
    11Makefile
    22Makefile.in
     3bspopts.h*
     4stamp-h*

  • c/src/lib/libbsp/powerpc/mpc8260ads/include/Makefile.am

    r2ed1563 r22afde51  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 H_FILES = bsp.h coverhd.h
    8 
    9 BSP_H_FILES =
     7include_HEADERS = bsp.h bspopts.h coverhd.h
    108
    119$(PROJECT_INCLUDE):
    … …  
    1513        $(mkinstalldirs) $@
    1614
    17 $(PROJECT_INCLUDE)/bsp.h: bsp.h
     15$(PROJECT_INCLUDE)/%.h: %.h
    1816        $(INSTALL_DATA) $< $@
    1917
    20 $(PROJECT_INCLUDE)/coverhd.h: coverhd.h
    21         $(INSTALL_DATA) $< $@
    22 
    23 
    24 
    25 PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp \
    26         $(PROJECT_INCLUDE)/bsp.h \
    27         $(PROJECT_INCLUDE)/coverhd.h
     18PREINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp \
     19        $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \
     20        $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
    2821
    2922all-local: $(PREINSTALL_FILES)

  • c/src/lib/libbsp/powerpc/mpc8260ads/include/bsp.h

    r2ed1563 r22afde51  
    2121extern "C" {
    2222#endif
     23
     24#include <bspopts.h>
    2325
    2426#include <rtems.h>

  • c/src/lib/libbsp/powerpc/mpc8260ads/irq/Makefile.am

    r2ed1563 r22afde51  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
     7include_bspdir = $(includedir)/bsp
     8
    79C_FILES = irq.c irq_init.c
    810C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    911
    10 H_FILES = irq.h
     12include_bsp_HEADERS = irq.h
    1113
    1214S_FILES = irq_asm.S
    … …  
    1921include $(top_srcdir)/../../../../../../automake/lib.am
    2022
     23## FIXME: WTF is this?
    2124SORDID_HACK:
    2225        rm -f $(PROJECT_INCLUDE)/bsp/irq.h
    … …  
    2831        $(INSTALL_DATA) $< $@
    2932
    30 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp \
    31     $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h)
     33PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
     34    $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
    3235
    3336#

  • c/src/lib/libbsp/powerpc/mpc8260ads/vectors/Makefile.am

    r2ed1563 r22afde51  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 VPATH = @srcdir@:
    8 
    97C_FILES = vectors_init.c
    108C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    119
    12 H_FILES = vectors.h
     10include_bspdir = $(includedir)/bsp
     11include_bsp_HEADERS = vectors.h   
    1312
    1413S_FILES = vectors.S
    … …  
    3130        $(mkinstalldirs) $@
    3231
    33 $(PROJECT_INCLUDE)/bsp/vectors.h: vectors.h
     32$(PROJECT_INCLUDE)/bsp/%.h: %.h
    3433        $(INSTALL_DATA) $< $@
    3534
    36 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp $(PROJECT_INCLUDE)/bsp/vectors.h
     35PREINSTALL_FILES = $(PROJECT_INCLUDE)/bsp \
     36   $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
    3737
    3838all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS)
Note: See TracChangeset for help on using the changeset viewer.