Changeset 94608578 in rtems


Ignore:
Timestamp:
Jan 10, 2000, 1:56:35 PM (20 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
10726095
Parents:
338f1dc
Message:

Patch rtems-rc-20000104-2.diff from Ralf Corsepius <corsepiu@…>
that converts nearly all of libbsp/sh to automake. Comments follow:

  1. Almost full automake support for the libbsp/sh/ subdirectories (exception libbsp/sh/gensh*/wrapup/*)
  2. Fixes for libbsp/bare/*
  3. Updates to libbsp/* configuration which supports old (autoconf/deep configuration) and new (automake/flat/cascaded configuration) style configuration of libbsp/<cpu>/*
Location:
c/src/lib/libbsp
Files:
17 added
13 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/bare/include/Makefile.am

    r338f1dc r94608578  
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
    6 H_FILES = bsp.h $(srcdir)/../../../shared/coverhd.h
    7 
     6H_FILES = bsp.h
    87noinst_HEADERS = $(H_FILES)
    98
    109TMPINSTALL_FILES += \
    1110$(PROJECT_INCLUDE) \
    12 $(H_FILES:%=$(PROJECT_INCLUDE)/%)
     11$(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) \
     12$(PROJECT_INCLUDE)/coverhd.h
    1313
    1414$(PROJECT_INCLUDE)/%.h: %.h
     15        $(INSTALL_DATA) $< $@
     16
     17$(PROJECT_INCLUDE)/coverhd.h: $(srcdir)/../../shared/include/coverhd.h
    1518        $(INSTALL_DATA) $< $@
    1619
  • c/src/lib/libbsp/configure.in

    r338f1dc r94608578  
    5959  RTEMS_LIBBSP_CPU_SUBDIR="bare"
    6060else
    61   RTEMS_LIBBSP_CPU_SUBDIR='$(RTEMS_CPU)'
     61  RTEMS_LIBBSP_CPU_SUBDIR=$RTEMS_CPU
    6262fi
    6363AC_SUBST(RTEMS_LIBBSP_CPU_SUBDIR)
    6464
     65if test ! -f ${srcdir}/${RTEMS_LIBBSP_CPU_SUBDIR}/configure.in
     66then
     67
    6568# find all the Makefiles for the BSPs
    66 makefiles="$makefiles $RTEMS_CPU/Makefile"
     69  makefiles="$makefiles $RTEMS_CPU/Makefile"
    6770     
    68 if test -d "$srcdir/$bspcpudir$bspdir"; then
    69   RTEMS_CHECK_MAKEFILE(${bspcpudir}$bspdir)
    70   RTEMS_CHECK_MAKEFILE(${bspcpudir}shared)
     71  if test -d "$srcdir/$bspcpudir$bspdir"; then
     72    RTEMS_CHECK_MAKEFILE(${bspcpudir}$bspdir)
     73    RTEMS_CHECK_MAKEFILE(${bspcpudir}shared)
    7174
    72   # HACK: sed out bsp-tools from makefiles
    73   t="$bspcpudir$bspdir/tools"
    74   if test -d "$srcdir/$t"; then
    75     bsptools_cfgdirs="$bsptools_cfgdirs $t"
    76     makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"`
     75    # HACK: sed out bsp-tools from makefiles
     76    t="$bspcpudir$bspdir/tools"
     77    if test -d "$srcdir/$t"; then
     78      bsptools_cfgdirs="$bsptools_cfgdirs $t"
     79      makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"`
     80    fi
     81  else
     82    AC_MSG_ERROR([unable to find libbsp subdirectory ($bspdir) for  ${RTEMS_BSP}])
    7783  fi
    7884else
    79   AC_MSG_ERROR([unable to find libbsp subdirectory ($bspdir) for  ${RTEMS_BSP}])
     85  cfg_subdirs="$RTEMS_LIBBSP_CPU_SUBDIR"
    8086fi
    8187
     
    8793  makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"`
    8894fi
     95
    8996AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
    9097
    9198AC_CONFIG_SUBDIRS($bsptools_cfgdirs)
    9299
    93 if test "$RTEMS_BSP" = "bare"; then
    94 cfg_subdirs="bare"
    95 fi
    96100AC_CONFIG_SUBDIRS($cfg_subdirs)
    97101
  • c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.in

    r338f1dc r94608578  
    88srcdir = @srcdir@
    99top_srcdir = @top_srcdir@
    10 top_builddir = ../../..
    11 subdir = sh/gensh1/wrapup
     10top_builddir = ..
     11subdir = wrapup
    1212
    1313RTEMS_ROOT = @RTEMS_ROOT@
     
    6363
    6464$(PROJECT_RELEASE)/lib/libbsp$(LIBSUFFIX_VA): $(LIB)
    65         $(INSTALL_DATA) $^ $@
     65        $(INSTALL_DATA) $< $@
    6666
    67 all: ${ARCH} $(SRCS) $(PROJECT_RELEASE)/lib/libbsp$(LIBSUFFIX_VA)
    68 
    69 install: all
    70 
    71 $(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
    72         $(INSTALL_DATA) $< $@
     67all: ${ARCH} $(PROJECT_RELEASE)/lib/libbsp$(LIBSUFFIX_VA)
    7368
    7469Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  • c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.in

    r338f1dc r94608578  
    88srcdir = @srcdir@
    99top_srcdir = @top_srcdir@
    10 top_builddir = ../../..
    11 subdir = sh/gensh2/wrapup
     10top_builddir = ..
     11subdir = wrapup
    1212
    1313RTEMS_ROOT = @RTEMS_ROOT@
     
    6161        $(make-library)
    6262
    63 all: ${ARCH} $(SRCS) $(LIB)
    64         $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
     63$(PROJECT_RELEASE)/lib/libbsp$(LIBSUFFIX_VA): $(LIB)
     64        $(INSTALL_DATA) $< $@
    6565
    66 install: all
     66all: ${ARCH} $(PROJECT_RELEASE)/lib/libbsp$(LIBSUFFIX_VA)
     67
    6768Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    6869        cd $(top_builddir) \
Note: See TracChangeset for help on using the changeset viewer.