Changeset 847dbbe in rtems


Ignore:
Timestamp:
Feb 1, 2000, 1:41:54 PM (20 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
399432fa
Parents:
8505e9b
Message:

Patches rtems-rc-20000118-5.diff from Ralf Corsepius <corsepiu@…>
that contains:

  • The fix for the gen68360/network/Makefile.am
  • automatically set permissions to 755 to scripts/buildall and scripts-ada/buildall (I remembered a trick to achieve this :).
  • automake support for libbsp/* and libcpu/* (Attn: This part will finally break old-style configuration for all non-public cpus)

NOTES:

  • This patch has only been tested for a random selection of BSPs (I haven't rebuilt all toolchains yet).
  • This patch is against rtem-cvs as of this morning (MET).

To apply:

patch -p1 <rtems-rc-20000118-5.diff
cvs rm -f ./c/src/lib/libbsp/Makefile.in
cvs rm -f ./c/src/lib/libbsp/shmdr/Makefile.in
cvs rm -f ./c/src/lib/libcpu/Makefile.in
cvs add ./c/src/lib/libbsp/Makefile.am
cvs add ./c/src/lib/libbsp/shmdr/Makefile.am
cvs add ./c/src/lib/libcpu/Makefile.am
./bootstrap

Files:
3 added
3 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/configure.in

    r8505e9b r847dbbe  
    99
    1010RTEMS_CANONICAL_TARGET_CPU
    11 AC_PROG_MAKE_SET
    12 AC_PROG_INSTALL
     11AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp,$RTEMS_VERSION,no)
    1312AM_MAINTAINER_MODE
    1413
    1514RTEMS_ENABLE_MULTIPROCESSING
    16 RTEMS_ENABLE_NETWORKING
    1715RTEMS_ENABLE_LIBCDIR
    1816RTEMS_ENABLE_BARE
     
    3129RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    3230RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
    33 RTEMS_CHECK_NETWORKING(RTEMS_BSP)
    3431
    3532RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
     
    5855fi
    5956AC_SUBST(RTEMS_LIBBSP_CPU_SUBDIR)
    60 
    61 if test ! -f ${srcdir}/${RTEMS_LIBBSP_CPU_SUBDIR}/configure.in
    62 then
    63 
    64 # find all the Makefiles for the BSPs
    65   makefiles="$makefiles $RTEMS_CPU/Makefile"
    66      
    67   if test -d "$srcdir/$bspcpudir$bspdir"; then
    68     RTEMS_CHECK_MAKEFILE(${bspcpudir}$bspdir)
    69     RTEMS_CHECK_MAKEFILE(${bspcpudir}shared)
    70 
    71     # HACK: sed out bsp-tools from makefiles
    72     t="$bspcpudir$bspdir/tools"
    73     if test -d "$srcdir/$t"; then
    74       bsptools_cfgdirs="$bsptools_cfgdirs $t"
    75       makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"`
    76     fi
    77   else
    78     AC_MSG_ERROR([unable to find libbsp subdirectory ($bspdir) for  ${RTEMS_BSP}])
    79   fi
    80 else
    81   cfg_subdirs="$RTEMS_LIBBSP_CPU_SUBDIR"
    82 fi
    83 
    84 if test "$HAS_MP" = "yes"; then
    85   makefiles="$makefiles shmdr/Makefile"
    86 else
    87   # HACK: sed out shmsupp/Makefile from makefiles
    88   t="$bspcpudir$bspdir/shmsupp"
    89   makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"`
    90 fi
     57cfg_subdirs="$RTEMS_LIBBSP_CPU_SUBDIR"
    9158
    9259AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
    93 
    94 AC_CONFIG_SUBDIRS($bsptools_cfgdirs)
    95 
    9660AC_CONFIG_SUBDIRS($cfg_subdirs)
    9761
    98 # try to explicitly list a Makefile here
     62# Explicitly list all Makefiles
    9963AC_OUTPUT(
    10064Makefile
    101 $makefiles)
     65shmdr/Makefile)
  • c/src/lib/libbsp/m68k/gen68360/network/Makefile.am

    r8505e9b r847dbbe  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 PGM = ${ARCH}/network.rel
     7PGM = $(ARCH)/network.rel
    88
    99C_FILES = network.c
    10 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
    11 
    12 H_FILES =
    13 noinst_HEADERS = $(H_FILES)
    14 
    15 network_rel_OBJECTS = $(C_O_FILES)
     10C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
     11 
     12OBJS = $(C_O_FILES)
    1613
    1714include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     
    2421AM_CPPFLAGS += -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
    2522
    26 $(PGM): ${network_rel_OBJECTS}
     23$(PGM): $(OBJS)
    2724        $(make-rel)
    2825
     26# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
     27
    2928if HAS_NETWORKING
    30 all-local: ${ARCH} $(PGM)
     29all-local: $(ARCH) $(OBJS) $(PGM)
    3130endif
    3231
    33 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
     32.PRECIOUS: $(PGM)
    3433
    3534EXTRA_DIST = network.c
  • c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am

    r8505e9b r847dbbe  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 PGM = ${ARCH}/shmsupp.rel
     7PGM = $(ARCH)/shmsupp.rel
    88
    99C_FILES = addrconv.c getcfg.c lock.c mpisr.c
    10 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
     10C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    1111
    1212OBJS = $(C_O_FILES)
     
    1919#
    2020
    21 $(PGM): ${OBJS}
     21$(PGM): $(OBJS)
    2222        $(make-rel)
    2323
     24# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
     25
    2426if HAS_MP
    25 all-local: ${ARCH} $(OBJS) $(PGM)
     27all-local: $(ARCH) $(OBJS) $(PGM)
    2628endif
    2729
    28 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
     30.PRECIOUS: $(PGM)
    2931
    3032EXTRA_DIST = addrconv.c getcfg.c lock.c mpisr.c
  • c/src/lib/libcpu/configure.in

    r8505e9b r847dbbe  
    88AC_CONFIG_AUX_DIR(../../../..)
    99
    10 AC_PROG_MAKE_SET
    1110RTEMS_CANONICAL_TARGET_CPU
    12 
     11AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu,$RTEMS_VERSION,no)
    1312AM_MAINTAINER_MODE
    14 
    15 RTEMS_ENABLE_LIBCDIR
    16 RTEMS_ENABLE_BARE
    17 
    18 RTEMS_ENV_RTEMSBSP
    19 
    20 AC_PROG_INSTALL
    2113
    2214RTEMS_CHECK_CPU
    2315RTEMS_CANONICAL_HOST
    2416
    25 RTEMS_PROJECT_ROOT
    26 
    27 dnl check target cc
    28 RTEMS_PROG_CC_FOR_TARGET
    29 RTEMS_CANONICALIZE_TOOLS
    30 
    31 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    32 
    3317# find all the CPU dependent library Makefiles
    3418if test -f $srcdir/$RTEMS_CPU/configure.in; then
    35   cfg_subdirs="$RTEMS_CPU"
    36 else
    37   RTEMS_CHECK_MAKEFILE($RTEMS_CPU)
     19  RTEMS_CPU_SUBDIR="$RTEMS_CPU"
    3820fi
    39 AC_CONFIG_SUBDIRS($cfg_subdirs)
     21AC_SUBST(RTEMS_CPU_SUBDIR)
     22
     23AC_CONFIG_SUBDIRS($RTEMS_CPU_SUBDIR)
    4024
    4125AC_OUTPUT(
    42 Makefile
    43 $makefiles)
     26Makefile)
  • scripts-ada/configure.in

    r8505e9b r847dbbe  
    4848binutils/Makefile
    4949gnatnewlib/Makefile
    50 gdb/Makefile
     50gdb/Makefile,,
     51chmod 755 buildall
    5152)
  • scripts/configure.in

    r8505e9b r847dbbe  
    4949gccnewlib/Makefile
    5050gdb/Makefile
    51 rtems/Makefile
     51rtems/Makefile,,
     52chmod 755 buildall
    5253)
  • scripts/setup.def

    r8505e9b r847dbbe  
     1#
    12# RTEMS tools setup
     3#
     4# $Id$
     5#
    26binutils_version=2.9.5.0.22
    37binutils_patch_version=20000114
Note: See TracChangeset for help on using the changeset viewer.