Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:

The main topic is replacing the hard-coded values for HAS_MP and
  HAS_RDBG in custom/*.cfg with per-bsp configuration-time autoconf checks
  (This is the patch I had mentioned before earlier this week).

  CHANGES

  * HAS_MP removed from custom/*.cfg, replaced with configuration time
    autoconf check
  * HAS_RDBG removed from custom/*.cfg, replaced with configuration-time
    autoconf check
  * NEW: c/src/make/bsp.cfg.in, takes configuration-time checked per-bsp
    values (i.e. HAS_MP, HAS_RDBG), gets installed as
    $(prefix)/<bsp>/make/bsp.cfg
  * NEW: default.cfg includes bsp.cfg - this change is backward
    compatible.
  * IMPORT_SRC: apply VPATH instead for ts_386ex/i386ex subdirectory
    Makefile.ins
  * HACK: a bug in acpolish mis-handles addtions to makefile variables
    which are enclosed in gmake conditionals:
    c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in
  * Apply inline_dir, HAS_MP and HAS_RDBG for avoiding configuration of
    unneeded subdirectories in various configure.in files.
  * Several minor changes in Makefile.ins and configure.ins, wrt. to the
    order of including *.cfg and defining Makefile variables

  APPLYING THE PATCH:

      patch -p1 < rtems-rc-19990709-4.diff
      ./autogen

aclocal/check-rdbg.m4

@@ -2,13 +2,15 @@ AC_DEFUN(RTEMS_CHECK_RDBG,
 [dnl
 AC_REQUIRE([RTEMS_TOP])dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
-AC_CACHE_CHECK([whether cpu supports librdbg],
+AC_CACHE_CHECK([whether BSP supports librdbg],
-  rtems_cv_has_rdbg,
+  rtems_cv_HAS_RDBG,
   [
-    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/librdbg/${RTEMS_CPU}"; then
+    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/librdbg/${RTEMS_CPU}/${$1}"; then
-      rtems_cv_has_rdbg="yes" ;
+      rtems_cv_HAS_RDBG="yes" ;
     else
-      rtems_cv_has_rdbg="no";
+      rtems_cv_HAS_RDBG="no";
     fi
   ])
+HAS_RDBG="$rtems_cv_HAS_RDBG"
+AC_SUBST(HAS_RDBG)
 ])

c/src/exec/aclocal.m4

@@ -894,44 +894,6 @@ AC_SUBST(RTEMS_USE_NEWLIB)
 ])
 
 
-dnl
-dnl $Id$
-dnl
-
-dnl RTEMS_CHECK_MAKEFILE(path)
-dnl Search for Makefile.in's within the directory starting
-dnl at path and append an entry for Makefile to global variable 
-dnl "makefiles" (from configure.in) for each Makefile.in found
-dnl 
-AC_DEFUN(RTEMS_CHECK_MAKEFILE,
-[RTEMS_CHECK_FILES_IN($1,Makefile,makefiles)
-])
-
-dnl
-dnl $Id$
-dnl
-
-dnl RTEMS_CHECK_FILES_IN(path,file,var)
-dnl path .. path relative to srcdir, where to start searching for files
-dnl file .. name of the files to search for
-dnl var  .. shell variable to append files found
-
-AC_DEFUN(RTEMS_CHECK_FILES_IN,
-[
-AC_MSG_CHECKING(for $2.in in $1)
-if test -d $srcdir/$1; then
-  rtems_av_save_dir=`pwd`;
-  cd $srcdir;
-  rtems_av_tmp=`find $1 -name "$2.in" -print | sed "s/$2\.in/%/" | sort | sed "s/%/$2/"`
-  $3="$$3 $rtems_av_tmp";
-  cd $rtems_av_save_dir;
-  AC_MSG_RESULT(done)
-else
-  AC_MSG_RESULT(no)
-fi
-])
-
-
 dnl $Id$
 
 dnl Report all available bsps for a target,
@@ -981,3 +943,68 @@ else
 fi
 ])dnl
 
+dnl $Id$
+
+AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
+[dnl
+AC_REQUIRE([RTEMS_TOP])dnl
+AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_CACHE_CHECK([whether BSP supports multiprocessing],
+  rtems_cv_HAS_MP,
+  [dnl
+    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${$1}/shmsupp"; then
+      if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
+        rtems_cv_HAS_MP="yes" ;
+      else
+        rtems_cv_HAS_MP="disabled";
+      fi
+    else
+      rtems_cv_HAS_MP="no";
+    fi
+  ])
+if test "$rtems_cv_HAS_MP" = "yes"; then
+HAS_MP="yes"
+else
+HAS_MP="no"
+fi
+AC_SUBST(HAS_MP)
+])
+
+dnl
+dnl $Id$
+dnl
+
+dnl RTEMS_CHECK_MAKEFILE(path)
+dnl Search for Makefile.in's within the directory starting
+dnl at path and append an entry for Makefile to global variable 
+dnl "makefiles" (from configure.in) for each Makefile.in found
+dnl 
+AC_DEFUN(RTEMS_CHECK_MAKEFILE,
+[RTEMS_CHECK_FILES_IN($1,Makefile,makefiles)
+])
+
+dnl
+dnl $Id$
+dnl
+
+dnl RTEMS_CHECK_FILES_IN(path,file,var)
+dnl path .. path relative to srcdir, where to start searching for files
+dnl file .. name of the files to search for
+dnl var  .. shell variable to append files found
+
+AC_DEFUN(RTEMS_CHECK_FILES_IN,
+[
+AC_MSG_CHECKING(for $2.in in $1)
+if test -d $srcdir/$1; then
+  rtems_av_save_dir=`pwd`;
+  cd $srcdir;
+  rtems_av_tmp=`find $1 -name "$2.in" -print | sed "s/$2\.in/%/" | sort | sed "s/%/$2/"`
+  $3="$$3 $rtems_av_tmp";
+  cd $rtems_av_save_dir;
+  AC_MSG_RESULT(done)
+else
+  AC_MSG_RESULT(no)
+fi
+])
+
+

c/src/exec/configure

@@ -2672,40 +2672,46 @@ RTEMS_USE_NEWLIB="$rtems_cv_use_newlib"
 
 
 
+# Check if there is custom/*.cfg for this BSP
+echo $ac_n "checking for make/custom/$RTEMS_BSP.cfg""... $ac_c" 1>&6
+echo "configure:2678: checking for make/custom/$RTEMS_BSP.cfg" >&5
+if test -r "$srcdir/$RTEMS_TOPdir/make/custom/$RTEMS_BSP.cfg"; then
+  echo "$ac_t""yes" 1>&6
+else
+  { echo "configure: error: no" 1>&2; exit 1; }
+fi
+
+
+echo $ac_n "checking whether BSP supports multiprocessing""... $ac_c" 1>&6
+echo "configure:2687: checking whether BSP supports multiprocessing" >&5
+if eval "test \"`echo '$''{'rtems_cv_HAS_MP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+      if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP}/shmsupp"; then
+      if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
+        rtems_cv_HAS_MP="yes" ;
+      else
+        rtems_cv_HAS_MP="disabled";
+      fi
+    else
+      rtems_cv_HAS_MP="no";
+    fi
+  
+fi
+
+echo "$ac_t""$rtems_cv_HAS_MP" 1>&6
+if test "$rtems_cv_HAS_MP" = "yes"; then
+HAS_MP="yes"
+else
+HAS_MP="no"
+fi
+
+
+
 # find all the Executive Makefiles
 
-echo $ac_n "checking for Makefile.in in rtems""... $ac_c" 1>&6
-echo "configure:2679: checking for Makefile.in in rtems" >&5
-if test -d $srcdir/rtems; then
-  rtems_av_save_dir=`pwd`;
-  cd $srcdir;
-  rtems_av_tmp=`find rtems -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"`
-  makefiles="$makefiles $rtems_av_tmp";
-  cd $rtems_av_save_dir;
-  echo "$ac_t""done" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-echo $ac_n "checking for Makefile.in in sapi""... $ac_c" 1>&6
-echo "configure:2694: checking for Makefile.in in sapi" >&5
-if test -d $srcdir/sapi; then
-  rtems_av_save_dir=`pwd`;
-  cd $srcdir;
-  rtems_av_tmp=`find sapi -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"`
-  makefiles="$makefiles $rtems_av_tmp";
-  cd $rtems_av_save_dir;
-  echo "$ac_t""done" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
 echo $ac_n "checking for Makefile.in in score/cpu/$RTEMS_CPU""... $ac_c" 1>&6
-echo "configure:2709: checking for Makefile.in in score/cpu/$RTEMS_CPU" >&5
+echo "configure:2715: checking for Makefile.in in score/cpu/$RTEMS_CPU" >&5
 if test -d $srcdir/score/cpu/$RTEMS_CPU; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2719,44 +2725,31 @@ fi
 
 
 
-if test "$RTEMS_HAS_POSIX_API" = "yes"; then
-  
-echo $ac_n "checking for Makefile.in in posix""... $ac_c" 1>&6
-echo "configure:2726: checking for Makefile.in in posix" >&5
-if test -d $srcdir/posix; then
-  rtems_av_save_dir=`pwd`;
-  cd $srcdir;
-  rtems_av_tmp=`find posix -name "Makefile.in" -print | sed "s/Makefile\.in/%/" | sort | sed "s/%/Makefile/"`
-  makefiles="$makefiles $rtems_av_tmp";
-  cd $rtems_av_save_dir;
-  echo "$ac_t""done" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-  makefiles="$makefiles wrapup/posix/Makefile"
-fi
-
-# Check if there is custom/*.cfg for this BSP
-echo $ac_n "checking for make/custom/$RTEMS_BSP.cfg""... $ac_c" 1>&6
-echo "configure:2744: checking for make/custom/$RTEMS_BSP.cfg" >&5
-if test -r "$srcdir/$RTEMS_TOPdir/make/custom/$RTEMS_BSP.cfg"; then
-  echo "$ac_t""yes" 1>&6
-else
-  { echo "configure: error: no" 1>&2; exit 1; }
-fi
-
-
 # If RTEMS macros are enabled, then use them.  Otherwise, use inlines.
 if test "$RTEMS_USE_MACROS" = "yes"; then
-  inline_dir=macros
+  inline_dir="macros"
   if test "$RTEMS_HAS_POSIX_API" = "yes"; then
     # The problem is that there is currently no code in posix/macros :)
     { echo "configure: error: Macros are not implemented for the POSIX API" 1>&2; exit 1; }
   fi
 else
-  inline_dir=inline
+  inline_dir="inline"
+fi
+
+if test "$RTEMS_HAS_POSIX_API" = "yes"; then
+  makefiles="$makefiles posix/Makefile"
+  makefiles="$makefiles posix/src/Makefile"
+  makefiles="$makefiles posix/include/Makefile"
+  makefiles="$makefiles posix/include/sys/Makefile"
+  makefiles="$makefiles posix/include/rtems/Makefile"
+  makefiles="$makefiles posix/include/rtems/posix/Makefile"
+  makefiles="$makefiles posix/include/wrap/Makefile"
+  makefiles="$makefiles posix/optman/Makefile"
+  makefiles="$makefiles wrapup/posix/Makefile"
+
+  makefiles="$makefiles posix/${inline_dir}/Makefile"
+  makefiles="$makefiles posix/${inline_dir}/rtems/Makefile"
+  makefiles="$makefiles posix/${inline_dir}/rtems/posix/Makefile"
 fi
 
 
@@ -2885,6 +2878,25 @@ ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "Makefile
+rtems/Makefile
+rtems/src/Makefile
+rtems/include/Makefile
+rtems/include/wrap/Makefile
+rtems/include/rtems/Makefile
+rtems/include/rtems/rtems/Makefile
+rtems/optman/Makefile
+rtems/${inline_dir}/Makefile
+rtems/${inline_dir}/rtems/Makefile
+rtems/${inline_dir}/rtems/rtems/Makefile
+sapi/Makefile
+sapi/src/Makefile
+sapi/include/Makefile
+sapi/include/wrap/Makefile
+sapi/include/rtems/Makefile
+sapi/include/rtems/sptables.h
+sapi/${inline_dir}/Makefile
+sapi/${inline_dir}/rtems/Makefile
+sapi/optman/Makefile
 score/Makefile
 score/cpu/Makefile
 score/include/Makefile
@@ -2898,7 +2910,6 @@ score/src/Makefile
 wrapup/Makefile
 wrapup/rtems/Makefile
 $makefiles
-sapi/include/rtems/sptables.h
 " | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -2982,6 +2993,7 @@ s%@STRIP_FOR_TARGET@%$STRIP_FOR_TARGET%g
 s%@RTEMS_GAS_CODE16@%$RTEMS_GAS_CODE16%g
 s%@CC@%$CC%g
 s%@RTEMS_USE_NEWLIB@%$RTEMS_USE_NEWLIB%g
+s%@HAS_MP@%$HAS_MP%g
 s%@RTEMS_VERSION@%$RTEMS_VERSION%g
 s%@rtems_cv_prog_cc_cross@%$rtems_cv_prog_cc_cross%g
 s%@RTEMS_HAS_CPLUSPLUS@%$RTEMS_HAS_CPLUSPLUS%g
@@ -3033,6 +3045,25 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile
+rtems/Makefile
+rtems/src/Makefile
+rtems/include/Makefile
+rtems/include/wrap/Makefile
+rtems/include/rtems/Makefile
+rtems/include/rtems/rtems/Makefile
+rtems/optman/Makefile
+rtems/${inline_dir}/Makefile
+rtems/${inline_dir}/rtems/Makefile
+rtems/${inline_dir}/rtems/rtems/Makefile
+sapi/Makefile
+sapi/src/Makefile
+sapi/include/Makefile
+sapi/include/wrap/Makefile
+sapi/include/rtems/Makefile
+sapi/include/rtems/sptables.h
+sapi/${inline_dir}/Makefile
+sapi/${inline_dir}/rtems/Makefile
+sapi/optman/Makefile
 score/Makefile
 score/cpu/Makefile
 score/include/Makefile
@@ -3046,7 +3077,6 @@ score/src/Makefile
 wrapup/Makefile
 wrapup/rtems/Makefile
 $makefiles
-sapi/include/rtems/sptables.h
 "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
@@ -3118,3 +3148,4 @@ chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
+

c/src/exec/configure.in

@@ -47,28 +47,39 @@ RTEMS_CHECK_SYSV_UNIX
 
 RTEMS_CHECK_NEWLIB
 
-# find all the Executive Makefiles
-RTEMS_CHECK_MAKEFILE(rtems)
-RTEMS_CHECK_MAKEFILE(sapi)
-RTEMS_CHECK_MAKEFILE(score/cpu/$RTEMS_CPU)
-
-if test "$RTEMS_HAS_POSIX_API" = "yes"; then
-  RTEMS_CHECK_MAKEFILE(posix)
-  makefiles="$makefiles wrapup/posix/Makefile"
-fi
-
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
+
+# find all the Executive Makefiles
+RTEMS_CHECK_MAKEFILE(score/cpu/$RTEMS_CPU)
+
 # If RTEMS macros are enabled, then use them.  Otherwise, use inlines.
 if test "$RTEMS_USE_MACROS" = "yes"; then
-  inline_dir=macros
+  inline_dir="macros"
   if test "$RTEMS_HAS_POSIX_API" = "yes"; then
     # The problem is that there is currently no code in posix/macros :)
     AC_MSG_ERROR(Macros are not implemented for the POSIX API)
   fi
 else
-  inline_dir=inline
+  inline_dir="inline"
+fi
+
+if test "$RTEMS_HAS_POSIX_API" = "yes"; then
+  makefiles="$makefiles posix/Makefile"
+  makefiles="$makefiles posix/src/Makefile"
+  makefiles="$makefiles posix/include/Makefile"
+  makefiles="$makefiles posix/include/sys/Makefile"
+  makefiles="$makefiles posix/include/rtems/Makefile"
+  makefiles="$makefiles posix/include/rtems/posix/Makefile"
+  makefiles="$makefiles posix/include/wrap/Makefile"
+  makefiles="$makefiles posix/optman/Makefile"
+  makefiles="$makefiles wrapup/posix/Makefile"
+
+  makefiles="$makefiles posix/${inline_dir}/Makefile"
+  makefiles="$makefiles posix/${inline_dir}/rtems/Makefile"
+  makefiles="$makefiles posix/${inline_dir}/rtems/posix/Makefile"
 fi
 
 AC_SUBST(RTEMS_VERSION)
@@ -85,6 +96,25 @@ AC_SUBST(CC_LDFLAGS_PROFILE_V)
 # Try to explicitly list a Makefile here 
 AC_OUTPUT( 
 Makefile
+rtems/Makefile
+rtems/src/Makefile
+rtems/include/Makefile
+rtems/include/wrap/Makefile
+rtems/include/rtems/Makefile
+rtems/include/rtems/rtems/Makefile
+rtems/optman/Makefile
+rtems/${inline_dir}/Makefile
+rtems/${inline_dir}/rtems/Makefile
+rtems/${inline_dir}/rtems/rtems/Makefile
+sapi/Makefile
+sapi/src/Makefile
+sapi/include/Makefile
+sapi/include/wrap/Makefile
+sapi/include/rtems/Makefile
+sapi/include/rtems/sptables.h
+sapi/${inline_dir}/Makefile
+sapi/${inline_dir}/rtems/Makefile
+sapi/optman/Makefile
 score/Makefile
 score/cpu/Makefile
 score/include/Makefile
@@ -98,5 +128,5 @@ score/src/Makefile
 wrapup/Makefile
 wrapup/rtems/Makefile
 $makefiles
-sapi/include/rtems/sptables.h
 )
+

c/src/exec/posix/include/rtems/posix/Makefile.in

@@ -13,6 +13,17 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/posix
+
+$(INSTALLDIRS):
+	@$(mkinstalldirs) $(INSTALLDIRS)
+
 # We only build multiprocessing related files if HAS_MP was defined
 MP_H_PIECES_yes_V = condmp mqueuemp mutexmp pthreadmp semaphoremp
 MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V)
@@ -26,17 +37,6 @@ H_FILES = $(H_PIECES:%=$(srcdir)/%.h)
 
 SRCS = $(H_FILES)
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/posix
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
 #
 # Add your list of files to delete here.  The config files
 #  already know how to delete some stuff, so you may want

c/src/exec/rtems/Makefile.in

@@ -26,8 +26,7 @@ $(INSTALLDIRS):
 
 SUB_DIRS = include $(INLINE) optman src
 
-preinstall: 
+preinstall: $(INSTALLDIRS) 
-	$(mkinstalldirs) $(INSTALLDIRS)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \

c/src/exec/rtems/include/rtems/rtems/Makefile.in

@@ -13,17 +13,6 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-# We only build multiprocessing related files if HAS_MP was defined
-MP_H_PIECES_yes_V = eventmp mp msgmp partmp regionmp semmp signalmp taskmp
-MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V)
-
-H_PIECES = asr attr clock config dpmem event eventset intr message modes \
-    options part ratemon region rtemsapi sem signal status support tasks \
-    timer types $(MP_H_PIECES)
-H_FILES = $(H_PIECES:%=$(srcdir)/%.h)
-
-SRCS = $(H_FILES)
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
@@ -35,6 +24,17 @@ INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/rtems
 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
 
+# We only build multiprocessing related files if HAS_MP was defined
+MP_H_PIECES_yes_V = eventmp mp msgmp partmp regionmp semmp signalmp taskmp
+MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V)
+
+H_PIECES = asr attr clock config dpmem event eventset intr message modes \
+    options part ratemon region rtemsapi sem signal status support tasks \
+    timer types $(MP_H_PIECES)
+H_FILES = $(H_PIECES:%=$(srcdir)/%.h)
+
+SRCS = $(H_FILES)
+
 #
 # Add your list of files to delete here.  The config files
 #  already know how to delete some stuff, so you may want

c/src/exec/rtems/src/Makefile.in

@@ -13,6 +13,11 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+INSTALL_CHANGE = @INSTALL_CHANGE@
+
 # We only build multiprocessing related files if HAS_MP was defined
 MP_C_PIECES_yes_V = eventmp mp msgmp partmp regionmp semmp signalmp taskmp
 MP_C_PIECES = $(MP_C_PIECES_$(HAS_MP)_V)
@@ -64,11 +69,6 @@ C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
 #
 # Add local stuff here using +=
 #

c/src/exec/sapi/include/rtems/Makefile.in

@@ -42,7 +42,7 @@ CLOBBER_ADDITIONS += sptables.h
 all: preinstall
 
 preinstall: $(INSTALLDIRS) $(H_FILES)
-	$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems
+	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/rtems
 
 sptables.h: $(srcdir)/sptables.h.in $(top_builddir)/config.status
 	cd $(top_builddir) \

c/src/exec/score/Makefile.in

@@ -27,7 +27,7 @@ $(INSTALLDIRS):
 SUB_DIRS = include $(INLINE) cpu src
 
 preinstall: 
-	$(mkinstalldirs) $(INSTALLDIRS)
+	@$(mkinstalldirs) $(INSTALLDIRS)
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \

c/src/exec/score/include/rtems/score/Makefile.in

@@ -13,6 +13,17 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/leaf.cfg
+
+INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
+
+$(INSTALLDIRS):
+	@$(mkinstalldirs) $(INSTALLDIRS)
+
 # We only build multiprocessing related files if HAS_MP was defined
 MP_H_PIECES_yes_V = mpci mppkt objectmp threadmp
 MP_H_PIECES = $(MP_H_PIECES_$(HAS_MP)_V)
@@ -26,17 +37,6 @@ TARGOPTS = targopts.h
 
 SRCS = $(H_FILES) $(TARGOPTS)
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
 RTEMS_USE_NEWLIB = @RTEMS_USE_NEWLIB@
 
 #

c/src/exec/score/inline/rtems/score/Makefile.in

@@ -13,17 +13,6 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-# We only build multiprocessing related files if HAS_MP was defined
-MP_I_PIECES_yes_V = mppkt objectmp threadmp
-MP_I_PIECES = $(MP_I_PIECES_$(HAS_MP)_V)
-
-I_PIECES = address chain coremsg coremutex coresem heap isr object priority \
-    stack states sysstate thread tod tqdata userext watchdog wkspace \
-    $(MP_I_PIECES)
-I_FILES = $(I_PIECES:%=$(srcdir)/%.inl)
-
-SRCS = $(I_FILES)
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
@@ -35,6 +24,17 @@ INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
 
+# We only build multiprocessing related files if HAS_MP was defined
+MP_I_PIECES_yes_V = mppkt objectmp threadmp
+MP_I_PIECES = $(MP_I_PIECES_$(HAS_MP)_V)
+
+I_PIECES = address chain coremsg coremutex coresem heap isr object priority \
+    stack states sysstate thread tod tqdata userext watchdog wkspace \
+    $(MP_I_PIECES)
+I_FILES = $(I_PIECES:%=$(srcdir)/%.inl)
+
+SRCS = $(I_FILES)
+
 #
 # Add your list of files to delete here.  The config files
 #  already know how to delete some stuff, so you may want

c/src/exec/score/macros/rtems/score/Makefile.in

@@ -13,17 +13,6 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-# We only build multiprocessing related files if HAS_MP was defined
-MP_I_PIECES_yes_V = mppkt objectmp threadmp
-MP_I_PIECES = $(MP_I_PIECES_$(HAS_MP)_V)
-
-I_PIECES = address chain coremsg coremutex coresem heap isr object priority \
-    stack states sysstate thread tod tqdata userext watchdog wkspace \
-    $(MP_I_PIECES)
-I_FILES = $(I_PIECES:%=$(srcdir)/%.inl)
-
-SRCS = $(I_FILES)
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
@@ -35,6 +24,17 @@ INSTALLDIRS = $(PROJECT_INCLUDE)/rtems/score
 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
 
+# We only build multiprocessing related files if HAS_MP was defined
+MP_I_PIECES_yes_V = mppkt objectmp threadmp
+MP_I_PIECES = $(MP_I_PIECES_$(HAS_MP)_V)
+
+I_PIECES = address chain coremsg coremutex coresem heap isr object priority \
+    stack states sysstate thread tod tqdata userext watchdog wkspace \
+    $(MP_I_PIECES)
+I_FILES = $(I_PIECES:%=$(srcdir)/%.inl)
+
+SRCS = $(I_FILES)
+
 #
 # Add your list of files to delete here.  The config files
 #  already know how to delete some stuff, so you may want

c/src/exec/score/src/Makefile.in

@@ -13,6 +13,11 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+INSTALL_CHANGE = @INSTALL_CHANGE@
+
 # We only build multiprocessing related files if HAS_MP was defined
 MP_C_PIECES_yes_V = mpci objectmp threadmp
 MP_C_PIECES = $(MP_C_PIECES_$(HAS_MP)_V)
@@ -35,11 +40,6 @@ C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
 #
 # Add local stuff here using +=
 #

c/src/exec/wrapup/posix/Makefile.in

@@ -55,7 +55,7 @@ $(LIB): ${OBJS}
 	$(make-library)
 
 all: ${ARCH} $(SRCS) $(LIB)
-	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
+	@$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \

c/src/lib/aclocal.m4

@@ -948,6 +948,33 @@ else
 fi
 ])dnl
 
+dnl $Id$
+
+AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
+[dnl
+AC_REQUIRE([RTEMS_TOP])dnl
+AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_CACHE_CHECK([whether BSP supports multiprocessing],
+  rtems_cv_HAS_MP,
+  [dnl
+    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${$1}/shmsupp"; then
+      if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
+        rtems_cv_HAS_MP="yes" ;
+      else
+        rtems_cv_HAS_MP="disabled";
+      fi
+    else
+      rtems_cv_HAS_MP="no";
+    fi
+  ])
+if test "$rtems_cv_HAS_MP" = "yes"; then
+HAS_MP="yes"
+else
+HAS_MP="no"
+fi
+AC_SUBST(HAS_MP)
+])
+
 dnl
 dnl  $Id$
 dnl 
@@ -1009,14 +1036,16 @@ AC_DEFUN(RTEMS_CHECK_RDBG,
 [dnl
 AC_REQUIRE([RTEMS_TOP])dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
-AC_CACHE_CHECK([whether cpu supports librdbg],
+AC_CACHE_CHECK([whether BSP supports librdbg],
-  rtems_cv_has_rdbg,
+  rtems_cv_HAS_RDBG,
   [
-    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/librdbg/${RTEMS_CPU}"; then
+    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/librdbg/${RTEMS_CPU}/${$1}"; then
-      rtems_cv_has_rdbg="yes" ;
+      rtems_cv_HAS_RDBG="yes" ;
     else
-      rtems_cv_has_rdbg="no";
+      rtems_cv_HAS_RDBG="no";
     fi
   ])
+HAS_RDBG="$rtems_cv_HAS_RDBG"
+AC_SUBST(HAS_RDBG)
 ])
 

c/src/lib/configure

@@ -2641,6 +2641,31 @@ else
   { echo "configure: error: no" 1>&2; exit 1; }
 fi
 
+echo $ac_n "checking whether BSP supports multiprocessing""... $ac_c" 1>&6
+echo "configure:2646: checking whether BSP supports multiprocessing" >&5
+if eval "test \"`echo '$''{'rtems_cv_HAS_MP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+      if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP}/shmsupp"; then
+      if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
+        rtems_cv_HAS_MP="yes" ;
+      else
+        rtems_cv_HAS_MP="disabled";
+      fi
+    else
+      rtems_cv_HAS_MP="no";
+    fi
+  
+fi
+
+echo "$ac_t""$rtems_cv_HAS_MP" 1>&6
+if test "$rtems_cv_HAS_MP" = "yes"; then
+HAS_MP="yes"
+else
+HAS_MP="no"
+fi
+
+
 
 
     # account for "aliased" bsps which share source code
@@ -2681,7 +2706,7 @@ fi
 if test -d "$srcdir/libbsp/$bspcpudir$bspdir"; then
   
 echo $ac_n "checking for Makefile.in in libbsp/${bspcpudir}$bspdir""... $ac_c" 1>&6
-echo "configure:2685: checking for Makefile.in in libbsp/${bspcpudir}$bspdir" >&5
+echo "configure:2710: checking for Makefile.in in libbsp/${bspcpudir}$bspdir" >&5
 if test -d $srcdir/libbsp/${bspcpudir}$bspdir; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2696,7 +2721,7 @@ fi
 
   
 echo $ac_n "checking for Makefile.in in libbsp/${bspcpudir}shared""... $ac_c" 1>&6
-echo "configure:2700: checking for Makefile.in in libbsp/${bspcpudir}shared" >&5
+echo "configure:2725: checking for Makefile.in in libbsp/${bspcpudir}shared" >&5
 if test -d $srcdir/libbsp/${bspcpudir}shared; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2732,7 +2757,7 @@ fi
 # find all the CPU dependent library Makefiles
 
 echo $ac_n "checking for Makefile.in in libcpu/$RTEMS_CPU""... $ac_c" 1>&6
-echo "configure:2736: checking for Makefile.in in libcpu/$RTEMS_CPU" >&5
+echo "configure:2761: checking for Makefile.in in libcpu/$RTEMS_CPU" >&5
 if test -d $srcdir/libcpu/$RTEMS_CPU; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2752,7 +2777,7 @@ case "${target}" in
   *)
     
 echo $ac_n "checking for Makefile.in in start/$RTEMS_CPU""... $ac_c" 1>&6
-echo "configure:2756: checking for Makefile.in in start/$RTEMS_CPU" >&5
+echo "configure:2781: checking for Makefile.in in start/$RTEMS_CPU" >&5
 if test -d $srcdir/start/$RTEMS_CPU; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2781,12 +2806,12 @@ fi
 
 # If the TCP/IP stack is enabled, then find all TCP/IP Makefiles
 echo $ac_n "checking if networking is enabled? ""... $ac_c" 1>&6
-echo "configure:2785: checking if networking is enabled? " >&5
+echo "configure:2810: checking if networking is enabled? " >&5
 echo "$ac_t""$RTEMS_HAS_NETWORKING" 1>&6
 if test "$RTEMS_HAS_NETWORKING" = "yes"; then
   
 echo $ac_n "checking for Makefile.in in libnetworking""... $ac_c" 1>&6
-echo "configure:2790: checking for Makefile.in in libnetworking" >&5
+echo "configure:2815: checking for Makefile.in in libnetworking" >&5
 if test -d $srcdir/libnetworking; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2801,7 +2826,7 @@ fi
 
   
 echo $ac_n "checking for Makefile.in in librpc""... $ac_c" 1>&6
-echo "configure:2805: checking for Makefile.in in librpc" >&5
+echo "configure:2830: checking for Makefile.in in librpc" >&5
 if test -d $srcdir/librpc; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2816,29 +2841,30 @@ fi
 
 
   if test "$RTEMS_HAS_RDBG" = "yes"; then
-    echo $ac_n "checking whether cpu supports librdbg""... $ac_c" 1>&6
+    echo $ac_n "checking whether BSP supports librdbg""... $ac_c" 1>&6
-echo "configure:2821: checking whether cpu supports librdbg" >&5
+echo "configure:2846: checking whether BSP supports librdbg" >&5
-if eval "test \"`echo '$''{'rtems_cv_has_rdbg'+set}'`\" = set"; then
+if eval "test \"`echo '$''{'rtems_cv_HAS_RDBG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
-    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/librdbg/${RTEMS_CPU}"; then
+    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/librdbg/${RTEMS_CPU}/${RTEMS_BSP}"; then
-      rtems_cv_has_rdbg="yes" ;
+      rtems_cv_HAS_RDBG="yes" ;
     else
-      rtems_cv_has_rdbg="no";
+      rtems_cv_HAS_RDBG="no";
     fi
   
 fi
 
-echo "$ac_t""$rtems_cv_has_rdbg" 1>&6
+echo "$ac_t""$rtems_cv_HAS_RDBG" 1>&6
+HAS_RDBG="$rtems_cv_HAS_RDBG"
 
-    RTEMS_HAS_RDBG="$rtems_cv_has_rdbg";
 
-    if test "$rtems_cv_has_rdbg" = "yes"; then
+
+    if test "$HAS_RDBG" = "yes"; then
       # Extract the first word of "rpcgen", so it can be a program name with args.
 set dummy rpcgen; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2842: checking for $ac_word" >&5
+echo "configure:2868: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RPCGEN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2869,7 +2895,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2873: checking for $ac_word" >&5
+echo "configure:2899: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2905,10 +2931,10 @@ done
         { echo "configure: error: missing awk, required to build librdbg" 1>&2; exit 1; }
       fi
     fi
-    if test "$rtems_cv_has_rdbg" = "yes"; then
+    if test "$HAS_RDBG" = "yes"; then
       
 echo $ac_n "checking for Makefile.in in librdbg""... $ac_c" 1>&6
-echo "configure:2912: checking for Makefile.in in librdbg" >&5
+echo "configure:2938: checking for Makefile.in in librdbg" >&5
 if test -d $srcdir/librdbg; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2929,7 +2955,7 @@ fi
 if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then
   
 echo $ac_n "checking for Makefile.in in librtems++""... $ac_c" 1>&6
-echo "configure:2933: checking for Makefile.in in librtems++" >&5
+echo "configure:2959: checking for Makefile.in in librtems++" >&5
 if test -d $srcdir/librtems++; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2960,13 +2986,13 @@ fi
 
 if test "$RTEMS_HAS_HWAPI" = "yes"; then
   echo $ac_n "checking whether libwapi is present""... $ac_c" 1>&6
-echo "configure:2964: checking whether libwapi is present" >&5
+echo "configure:2990: checking whether libwapi is present" >&5
   if test -f ${srcdir}/libhwapi/Makefile.in ; then
     echo "$ac_t""yes" 1>&6
     makefiles="$makefiles libhwapi/Makefile"
     
 echo $ac_n "checking for Makefile.in in libhwapi/analog""... $ac_c" 1>&6
-echo "configure:2970: checking for Makefile.in in libhwapi/analog" >&5
+echo "configure:2996: checking for Makefile.in in libhwapi/analog" >&5
 if test -d $srcdir/libhwapi/analog; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2981,7 +3007,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in libhwapi/discrete""... $ac_c" 1>&6
-echo "configure:2985: checking for Makefile.in in libhwapi/discrete" >&5
+echo "configure:3011: checking for Makefile.in in libhwapi/discrete" >&5
 if test -d $srcdir/libhwapi/discrete; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2996,7 +3022,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in libhwapi/drivers""... $ac_c" 1>&6
-echo "configure:3000: checking for Makefile.in in libhwapi/drivers" >&5
+echo "configure:3026: checking for Makefile.in in libhwapi/drivers" >&5
 if test -d $srcdir/libhwapi/drivers; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3011,7 +3037,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in libhwapi/non_volatile_memory""... $ac_c" 1>&6
-echo "configure:3015: checking for Makefile.in in libhwapi/non_volatile_memory" >&5
+echo "configure:3041: checking for Makefile.in in libhwapi/non_volatile_memory" >&5
 if test -d $srcdir/libhwapi/non_volatile_memory; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3026,7 +3052,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in libhwapi/serial""... $ac_c" 1>&6
-echo "configure:3030: checking for Makefile.in in libhwapi/serial" >&5
+echo "configure:3056: checking for Makefile.in in libhwapi/serial" >&5
 if test -d $srcdir/libhwapi/serial; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3041,7 +3067,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in libhwapi/support""... $ac_c" 1>&6
-echo "configure:3045: checking for Makefile.in in libhwapi/support" >&5
+echo "configure:3071: checking for Makefile.in in libhwapi/support" >&5
 if test -d $srcdir/libhwapi/support; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3056,7 +3082,7 @@ fi
 
     
 echo $ac_n "checking for Makefile.in in libhwapi/wrapup""... $ac_c" 1>&6
-echo "configure:3060: checking for Makefile.in in libhwapi/wrapup" >&5
+echo "configure:3086: checking for Makefile.in in libhwapi/wrapup" >&5
 if test -d $srcdir/libhwapi/wrapup; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3084,7 +3110,7 @@ fi
 # pick up all the Makefiles in required parts of the tree
 
 echo $ac_n "checking for Makefile.in in libchip""... $ac_c" 1>&6
-echo "configure:3088: checking for Makefile.in in libchip" >&5
+echo "configure:3114: checking for Makefile.in in libchip" >&5
 if test -d $srcdir/libchip; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3099,7 +3125,7 @@ fi
 
 
 echo $ac_n "checking for Makefile.in in libmisc""... $ac_c" 1>&6
-echo "configure:3103: checking for Makefile.in in libmisc" >&5
+echo "configure:3129: checking for Makefile.in in libmisc" >&5
 if test -d $srcdir/libmisc; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -3325,9 +3351,11 @@ s%@RTEMS_GAS_CODE16@%$RTEMS_GAS_CODE16%g
 s%@RTEMS_GAS_CODE16_TRUE@%$RTEMS_GAS_CODE16_TRUE%g
 s%@RTEMS_GAS_CODE16_FALSE@%$RTEMS_GAS_CODE16_FALSE%g
 s%@CC@%$CC%g
+s%@HAS_MP@%$HAS_MP%g
 s%@RTEMS_LIBBSP_CPU_SUBDIR@%$RTEMS_LIBBSP_CPU_SUBDIR%g
 s%@UNIX_TRUE@%$UNIX_TRUE%g
 s%@UNIX_FALSE@%$UNIX_FALSE%g
+s%@HAS_RDBG@%$HAS_RDBG%g
 s%@RPCGEN@%$RPCGEN%g
 s%@AWK@%$AWK%g
 s%@RTEMS_HAS_CPLUSPLUS@%$RTEMS_HAS_CPLUSPLUS%g

c/src/lib/configure.in

@@ -56,6 +56,7 @@ makefiles="$makefiles libbsp/bare/Makefile"
 fi
 
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 
 RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir)
 
@@ -131,10 +132,9 @@ if test "$RTEMS_HAS_NETWORKING" = "yes"; then
   RTEMS_CHECK_MAKEFILE(librpc)
 
   if test "$RTEMS_HAS_RDBG" = "yes"; then
-    RTEMS_CHECK_RDBG
+    RTEMS_CHECK_RDBG(RTEMS_BSP)
-    RTEMS_HAS_RDBG="$rtems_cv_has_rdbg";
 
-    if test "$rtems_cv_has_rdbg" = "yes"; then
+    if test "$HAS_RDBG" = "yes"; then
       AC_CHECK_PROG(RPCGEN,rpcgen,rpcgen)
       AC_PROG_AWK
       if test -z "$RPCGEN"; then
@@ -144,7 +144,7 @@ if test "$RTEMS_HAS_NETWORKING" = "yes"; then
         AC_MSG_ERROR([missing awk, required to build librdbg])
       fi
     fi
-    if test "$rtems_cv_has_rdbg" = "yes"; then
+    if test "$HAS_RDBG" = "yes"; then
       RTEMS_CHECK_MAKEFILE(librdbg)
     fi
   fi

c/src/lib/libbsp/hppa1.1/simhppa/wrapup/Makefile.in

@@ -13,17 +13,17 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-BSP_PIECES = startup tty
-# pieces to pick up out of libcpu/hppa
-CPU_PIECES = clock milli timer
-GENERIC_PIECES =
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 INSTALL = @INSTALL@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
+BSP_PIECES = startup tty
+# pieces to pick up out of libcpu/hppa
+CPU_PIECES = clock milli timer
+GENERIC_PIECES =
+
 GENERIC_MP_REL_PIECES_yes_V = shmdr
 GENERIC_MP_REL_PIECES_no_V =
 GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)

c/src/lib/libbsp/i386/force386/wrapup/Makefile.in

@@ -13,15 +13,15 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-BSP_PIECES = startup clock console timer
-GENERIC_PIECES =
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 INSTALL = @INSTALL@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
+BSP_PIECES = startup clock console timer
+GENERIC_PIECES =
+
 GENERIC_MP_REL_PIECES_yes_V = shmdr
 GENERIC_MP_REL_PIECES_no_V =
 GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)

c/src/lib/libbsp/i386/i386ex/console/Makefile.in

@@ -11,12 +11,10 @@ subdir = libbsp/i386/i386ex/console
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-VPATH = @srcdir@
+VPATH = @srcdir@:@srcdir@/../../shared/io
 
 PGM = ${ARCH}/console.rel
 
-IMPORT_SRC = $(srcdir)/../../shared/io/printk.c
-
 # C source names, if any, go here -- minus the .c
 C_PIECES = console printk
 C_FILES = $(C_PIECES:%=%.c)
@@ -58,13 +56,10 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-preinstall: 
-	${CP} ${IMPORT_SRC} .
-
 ${PGM}: ${SRCS} ${OBJS}
 	$(make-rel)
 
-all: ${ARCH} preinstall $(SRCS) $(PGM)
+all: ${ARCH} $(SRCS) $(PGM)
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 install: all

c/src/lib/libbsp/i386/ts_386ex/console/Makefile.in

@@ -11,12 +11,10 @@ subdir = libbsp/i386/ts_386ex/console
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-VPATH = @srcdir@
+VPATH = @srcdir@:@srcdir@/../../shared/io
 
 PGM = ${ARCH}/console.rel
 
-IMPORT_SRC = $(srcdir)/../../shared/io/printk.c
-
 # C source names, if any, go here -- minus the .c
 C_PIECES = console printk
 C_FILES = $(C_PIECES:%=%.c)
@@ -58,13 +56,10 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-preinstall: 
-	${CP} ${IMPORT_SRC} .
-
 ${PGM}: ${SRCS} ${OBJS}
 	$(make-rel)
 
-all: ${ARCH} preinstall $(SRCS) $(PGM)
+all: ${ARCH} $(SRCS) $(PGM)
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 install: all

c/src/lib/libbsp/i386/ts_386ex/start/Makefile.in

@@ -58,7 +58,7 @@ CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
 all: ${ARCH} $(SRCS) $(OBJS) $(PGM)
-	$(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib
+	@$(INSTALL_VARIANT) -m 755 ${PGMS} $(PROJECT_RELEASE)/lib
 
 # Install the program(s), appending _g or _p as appropriate.
 # for include files, just use $(INSTALL_CHANGE)

c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.in

@@ -69,15 +69,10 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-preinstall: 
-	$(INSTALL_CHANGE) ${IMPORT_SRC} .
-
-#	${CP} ${IMPORT_SRC} .
-
 ${PGM}: ${SRCS} ${OBJS}
 	$(make-rel)
-all: ${ARCH} preinstall $(SRCS) $(PGM)
+all: ${ARCH} $(SRCS) $(PGM)
-	$(INSTALL_CHANGE) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib
+	@$(INSTALL_CHANGE) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 install: all

c/src/lib/libbsp/i960/cvme961/wrapup/Makefile.in

@@ -13,15 +13,15 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-BSP_PIECES = startup clock console timer
-GENERIC_PIECES =
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 INSTALL = @INSTALL@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
+BSP_PIECES = startup clock console timer
+GENERIC_PIECES =
+
 GENERIC_MP_REL_PIECES_yes_V = shmdr
 GENERIC_MP_REL_PIECES_no_V =
 GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)

c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in

@@ -13,15 +13,15 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-BSP_PIECES = startup clock console timer
-GENERIC_PIECES =
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 INSTALL = @INSTALL@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
+BSP_PIECES = startup clock console timer
+GENERIC_PIECES =
+
 GENERIC_MP_REL_PIECES_yes_V = shmdr
 GENERIC_MP_REL_PIECES_no_V =
 GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)

c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in

@@ -13,15 +13,15 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-BSP_PIECES = startup clock console timer
-GENERIC_PIECES =
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 INSTALL = @INSTALL@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
+BSP_PIECES = startup clock console timer
+GENERIC_PIECES =
+
 GENERIC_MP_REL_PIECES_yes_V = shmdr
 GENERIC_MP_REL_PIECES_no_V =
 GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)

c/src/lib/libbsp/m68k/ods68302/start/Makefile.in

@@ -15,11 +15,14 @@ VPATH = @srcdir@
 
 PGM = ${ARCH}/start302.o
 
-ifeq ($(RTEMS_DEBUGGER),yes)
+RESET_S_PIECES_yes_V = debugreset
-RESET_S_PIECES = debugreset reset
+RESET_S_PIECES_no_V = reset
-else 
+RESET_S_PIECES__V = $(RESET_S_PIECES_no_V)
-CFLAGS +=
+RESET_S_PIECES = $(RESET_S_PIECES_$(RTEMS_DEBUGGER)_V)
-endif 
+
+CFLAGS_no_V = -DGDB_MONITOR_ACTIVE
+CFLAGS__V = $(CFLAGS_no_V)
+CFLAGS_V = $(CFLAGS_$(RTEMS_DEBUGGER)_V)
 
 # C source names, if any, go here -- minus the .c
 C_PIECES = cpuboot
@@ -47,7 +50,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 
 DEFINES +=
 CPPFLAGS +=
-CFLAGS +=
+CFLAGS += $(CFLAGS_V)
 
 LD_PATHS +=
 LD_LIBS +=

c/src/lib/libbsp/m68k/ods68302/start302/Makefile.in

@@ -15,11 +15,14 @@ VPATH = @srcdir@
 
 PGM = ${ARCH}/start302.o
 
-ifeq ($(RTEMS_DEBUGGER),yes)
+RESET_S_PIECES_yes_V = debugreset
-RESET_S_PIECES = debugreset reset
+RESET_S_PIECES_no_V = reset
-else 
+RESET_S_PIECES__V = $(RESET_S_PIECES_no_V)
-CFLAGS +=
+RESET_S_PIECES = $(RESET_S_PIECES_$(RTEMS_DEBUGGER)_V)
-endif 
+
+CFLAGS_no_V = -DGDB_MONITOR_ACTIVE
+CFLAGS__V = $(CFLAGS_no_V)
+CFLAGS_V = $(CFLAGS_$(RTEMS_DEBUGGER)_V)
 
 # C source names, if any, go here -- minus the .c
 C_PIECES = cpuboot
@@ -47,7 +50,7 @@ INSTALL_CHANGE = @INSTALL_CHANGE@
 
 DEFINES +=
 CPPFLAGS +=
-CFLAGS +=
+CFLAGS += $(CFLAGS_V)
 
 LD_PATHS +=
 LD_LIBS +=

c/src/lib/libbsp/no_cpu/no_bsp/wrapup/Makefile.in

@@ -13,14 +13,13 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-BSP_PIECES = startup clock console timer
-GENERIC_PIECES = $
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
+BSP_PIECES = startup clock console timer
+
 GENERIC_MP_REL_PIECES_yes_V = shmdr
 GENERIC_MP_REL_PIECES_no_V =
 GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)

c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.in

@@ -67,7 +67,7 @@ CLOBBER_ADDITIONS +=
 ${PGM}: ${SRCS} ${OBJS}
 	$(make-rel)
 
-all: ${ARCH} $(SRCS) $(INSTALLED_O_FILES) $(PGM)
+all: ${ARCH} $(SRCS) $(PGM)
 	$(INSTALL_CHANGE) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in

@@ -53,7 +53,7 @@ LD_PATHS +=
 LD_LIBS +=
 LDFLAGS +=
 
-IMAGES : = rtems.gz
+IMAGES = rtems.gz
 
 #
 # Add your list of files to delete here.  The config files

c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.in

@@ -53,7 +53,7 @@ LD_PATHS +=
 LD_LIBS +=
 LDFLAGS +=
 
-IMAGES : = rtems.gz
+IMAGES = rtems.gz
 
 #
 # Add your list of files to delete here.  The config files

c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.in

@@ -13,17 +13,17 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-BSP_PIECES = startup clock console timer vectors
-# pieces to pick up out of libcpu/ppc
-CPU_PIECES =
-GENERIC_PIECES =
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/lib.cfg
 
 INSTALL = @INSTALL@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 
+BSP_PIECES = startup clock console timer vectors
+# pieces to pick up out of libcpu/ppc
+CPU_PIECES =
+GENERIC_PIECES =
+
 GENERIC_MP_REL_PIECES_yes_V = shmdr
 GENERIC_MP_REL_PIECES_no_V =
 GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)

c/src/lib/libbsp/powerpc/score603e/startup/Makefile.in

@@ -35,6 +35,12 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_RELEASE)/lib
+
+$(INSTALLDIRS):
+	@$(mkinstalldirs) $(INSTALLDIRS)
 
 # First and second generation use different Bridge chips :(
 # C source names, if any, go here -- minus the .c
@@ -69,9 +75,8 @@ CLOBBER_ADDITIONS +=
 ${PGM}: ${SRCS} ${OBJS}
 	$(make-rel)
 
-all: ${ARCH} $(SRCS) $(INSTALLED_O_FILES) $(PGM)
+all: ${ARCH} $(SRCS) $(PGM)
-	$(INSTALL) $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib
+	$(INSTALL_CHANGE) -m 644 $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib
-	$(INSTALL_VARIANT) $(INSTALLED_O_FILES) $(PROJECT_RELEASE)/lib
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \

c/src/lib/libchip/serial/Makefile.in

@@ -59,7 +59,7 @@ CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
 all: ${ARCH} preinstall $(LIB)
-	$(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
+	@$(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
 
 $(LIB): $(SRCS) ${OBJS}
 	$(make-library)

c/src/lib/libcpu/powerpc/mpc750/exceptions/Makefile.in

@@ -66,7 +66,7 @@ CLOBBER_ADDITIONS +=
 ${PGM}: ${SRCS} ${OBJS}
 	$(make-rel)
 
-preinstall: 
+preinstall: $(INSTALLDIRS) $(H_FILES)
 	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/libcpu
 
 all: ${ARCH} $(SRCS) preinstall $(PGM)

c/src/lib/libcpu/powerpc/mpc750/mmu/Makefile.in

@@ -66,7 +66,7 @@ CLOBBER_ADDITIONS +=
 ${PGM}: ${SRCS} ${OBJS}
 	$(make-rel)
 
-preinstall: 
+preinstall: $(INSTALLDIRS) $(H_FILES)
 	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/libcpu
 
 all: ${ARCH} $(SRCS) preinstall $(PGM)

c/src/lib/libmisc/monitor/Makefile.in

@@ -13,6 +13,17 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_INCLUDE)/rtems
+
+$(INSTALLDIRS):
+	@$(mkinstalldirs) $(INSTALLDIRS)
+
 LIB = ${ARCH}/libmonitor-tmp.a
 
 # C source names, if any, go here -- minus the .c
@@ -32,17 +43,6 @@ INSTALLED_H_FILES = $(srcdir)/monitor.h $(srcdir)/symbols.h
 SRCS = README $(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
 OBJS = $(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #

c/src/lib/libnetworking/include/Makefile.in

@@ -77,16 +77,16 @@ CLOBBER_ADDITIONS +=
 # We only make the install point for the networking header files if needed.
 
 preinstall: $(INSTALLDIRS) $(SRCS)
-	$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/networking
+	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/networking
-	$(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/networking/sys
+	@$(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/networking/sys
-	$(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/networking/rtems
+	@$(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/networking/rtems
-	$(INSTALL_CHANGE) -m 644 $(MACHINE_H_FILES) $(PROJECT_INCLUDE)/networking/machine
+	@$(INSTALL_CHANGE) -m 644 $(MACHINE_H_FILES) $(PROJECT_INCLUDE)/networking/machine
-	$(INSTALL_CHANGE) -m 644 $(VM_H_FILES) $(PROJECT_INCLUDE)/networking/vm
+	@$(INSTALL_CHANGE) -m 644 $(VM_H_FILES) $(PROJECT_INCLUDE)/networking/vm
-	$(INSTALL_CHANGE) -m 644 $(NET_H_FILES) $(PROJECT_INCLUDE)/networking/net
+	@$(INSTALL_CHANGE) -m 644 $(NET_H_FILES) $(PROJECT_INCLUDE)/networking/net
-	$(INSTALL_CHANGE) -m 644 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/networking/netinet
+	@$(INSTALL_CHANGE) -m 644 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/networking/netinet
-	$(INSTALL_CHANGE) -m 644 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/networking/arpa
+	@$(INSTALL_CHANGE) -m 644 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/networking/arpa
-	$(INSTALL_CHANGE) -m 644 $(NFS_H_FILES) $(PROJECT_INCLUDE)/networking/nfs
+	@$(INSTALL_CHANGE) -m 644 $(NFS_H_FILES) $(PROJECT_INCLUDE)/networking/nfs
-	$(INSTALL_CHANGE) -m 644 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE)/networking
+	@$(INSTALL_CHANGE) -m 644 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE)/networking
 
 all: preinstall
 

c/src/lib/librdbg/i386/pc386/Makefile.in

@@ -77,7 +77,7 @@ CLOBBER_ADDITIONS +=
 FRONTEND = \"$(RTEMS_CPU)/@RTEMS_BSP@/remdeb_f.x\"
 
 all: ${ARCH} $(LIB) 
-	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
+	@$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
 $(LIB): $(SRCS) ${OBJS}
 	$(make-library)
@@ -87,7 +87,7 @@ remdeb.h: $(X_FILES)
 	( pwd=`pwd`; cd $(srcdir)/../..; \
 	$(RPCGEN) -h -DFRONTEND=$(FRONTEND) \
 	  -o $$pwd/$@ remdeb.x )
-	$(INSTALL_CHANGE) -m 755 $@ $(PROJECT_INCLUDE)/rdbg
+	@$(INSTALL_CHANGE) -m 755 $@ $(PROJECT_INCLUDE)/rdbg
 
 remdeb_xdr.c: $(X_FILES)
 	@rm -f $@

c/src/libchip/serial/Makefile.in

@@ -59,7 +59,7 @@ CLEAN_ADDITIONS += $(LIB)
 CLOBBER_ADDITIONS +=
 
 all: ${ARCH} preinstall $(LIB)
-	$(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
+	@$(INSTALL_VARIANT) -m 644 ${LIB} $(PROJECT_RELEASE)/lib
 
 $(LIB): $(SRCS) ${OBJS}
 	$(make-library)

c/src/libmisc/monitor/Makefile.in

@@ -13,6 +13,17 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+INSTALL_CHANGE = @INSTALL_CHANGE@
+mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
+
+INSTALLDIRS = $(PROJECT_INCLUDE)/rtems
+
+$(INSTALLDIRS):
+	@$(mkinstalldirs) $(INSTALLDIRS)
+
 LIB = ${ARCH}/libmonitor-tmp.a
 
 # C source names, if any, go here -- minus the .c
@@ -32,17 +43,6 @@ INSTALLED_H_FILES = $(srcdir)/monitor.h $(srcdir)/symbols.h
 SRCS = README $(C_FILES) $(H_FILES) $(INSTALLED_H_FILES)
 OBJS = $(C_O_FILES)
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
-
-INSTALLDIRS = $(PROJECT_INCLUDE)/rtems
-
-$(INSTALLDIRS):
-	@$(mkinstalldirs) $(INSTALLDIRS)
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #

c/src/libnetworking/include/Makefile.in

@@ -77,16 +77,16 @@ CLOBBER_ADDITIONS +=
 # We only make the install point for the networking header files if needed.
 
 preinstall: $(INSTALLDIRS) $(SRCS)
-	$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/networking
+	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/networking
-	$(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/networking/sys
+	@$(INSTALL_CHANGE) -m 644 $(SYS_H_FILES) $(PROJECT_INCLUDE)/networking/sys
-	$(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/networking/rtems
+	@$(INSTALL_CHANGE) -m 644 $(RTEMS_H_FILES) $(PROJECT_INCLUDE)/networking/rtems
-	$(INSTALL_CHANGE) -m 644 $(MACHINE_H_FILES) $(PROJECT_INCLUDE)/networking/machine
+	@$(INSTALL_CHANGE) -m 644 $(MACHINE_H_FILES) $(PROJECT_INCLUDE)/networking/machine
-	$(INSTALL_CHANGE) -m 644 $(VM_H_FILES) $(PROJECT_INCLUDE)/networking/vm
+	@$(INSTALL_CHANGE) -m 644 $(VM_H_FILES) $(PROJECT_INCLUDE)/networking/vm
-	$(INSTALL_CHANGE) -m 644 $(NET_H_FILES) $(PROJECT_INCLUDE)/networking/net
+	@$(INSTALL_CHANGE) -m 644 $(NET_H_FILES) $(PROJECT_INCLUDE)/networking/net
-	$(INSTALL_CHANGE) -m 644 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/networking/netinet
+	@$(INSTALL_CHANGE) -m 644 $(NETINET_H_FILES) $(PROJECT_INCLUDE)/networking/netinet
-	$(INSTALL_CHANGE) -m 644 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/networking/arpa
+	@$(INSTALL_CHANGE) -m 644 $(ARPA_H_FILES) $(PROJECT_INCLUDE)/networking/arpa
-	$(INSTALL_CHANGE) -m 644 $(NFS_H_FILES) $(PROJECT_INCLUDE)/networking/nfs
+	@$(INSTALL_CHANGE) -m 644 $(NFS_H_FILES) $(PROJECT_INCLUDE)/networking/nfs
-	$(INSTALL_CHANGE) -m 644 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE)/networking
+	@$(INSTALL_CHANGE) -m 644 $(RTEMS_SERVERS_H_FILES) $(PROJECT_INCLUDE)/networking
 
 all: preinstall
 

c/src/librdbg/src/i386/any/Makefile.in

@@ -77,7 +77,7 @@ CLOBBER_ADDITIONS +=
 FRONTEND = \"$(RTEMS_CPU)/@RTEMS_BSP@/remdeb_f.x\"
 
 all: ${ARCH} $(LIB) 
-	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
+	@$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
 $(LIB): $(SRCS) ${OBJS}
 	$(make-library)
@@ -87,7 +87,7 @@ remdeb.h: $(X_FILES)
 	( pwd=`pwd`; cd $(srcdir)/../..; \
 	$(RPCGEN) -h -DFRONTEND=$(FRONTEND) \
 	  -o $$pwd/$@ remdeb.x )
-	$(INSTALL_CHANGE) -m 755 $@ $(PROJECT_INCLUDE)/rdbg
+	@$(INSTALL_CHANGE) -m 755 $@ $(PROJECT_INCLUDE)/rdbg
 
 remdeb_xdr.c: $(X_FILES)
 	@rm -f $@

c/src/librdbg/src/i386/pc386/Makefile.in

@@ -77,7 +77,7 @@ CLOBBER_ADDITIONS +=
 FRONTEND = \"$(RTEMS_CPU)/@RTEMS_BSP@/remdeb_f.x\"
 
 all: ${ARCH} $(LIB) 
-	$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
+	@$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
 
 $(LIB): $(SRCS) ${OBJS}
 	$(make-library)
@@ -87,7 +87,7 @@ remdeb.h: $(X_FILES)
 	( pwd=`pwd`; cd $(srcdir)/../..; \
 	$(RPCGEN) -h -DFRONTEND=$(FRONTEND) \
 	  -o $$pwd/$@ remdeb.x )
-	$(INSTALL_CHANGE) -m 755 $@ $(PROJECT_INCLUDE)/rdbg
+	@$(INSTALL_CHANGE) -m 755 $@ $(PROJECT_INCLUDE)/rdbg
 
 remdeb_xdr.c: $(X_FILES)
 	@rm -f $@

c/src/make/Makefile.am

@@ -26,6 +26,10 @@ rtems_bspdir = $(rtemsdir)/@RTEMS_BSP@
 rtems_bsp_DATA = \
 Makefile.inc
 
+rtems_bsp_makedir = $(rtems_bspdir)/make
+rtems_bsp_make_DATA = \
+bsp.cfg
+
 if MAINTAINER_MODE
 $(srcdir)/main.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/main.cfg
 	sed -e 's%\$$(RTEMS_BSP)%\@RTEMS_BSP\@%g' < $< >$@

c/src/make/Makefile.in

@@ -87,6 +87,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXX_FOR_TARGET = @CXX_FOR_TARGET@
 GCCSED = @GCCSED@
+HAS_MP = @HAS_MP@
+HAS_RDBG = @HAS_RDBG@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 KSH = @KSH@
 LN = @LN@
@@ -143,14 +145,19 @@ rtems_bspdir = $(rtemsdir)/@RTEMS_BSP@
 rtems_bsp_DATA =  Makefile.inc
 
 
+rtems_bsp_makedir = $(rtems_bspdir)/make
+rtems_bsp_make_DATA =  bsp.cfg
+
+
 SUBDIRS = compilers custom Templates
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/../../../mkinstalldirs
-CONFIG_CLEAN_FILES =  Makefile.inc main.cfg host.cfg target.cfg
+CONFIG_CLEAN_FILES =  Makefile.inc main.cfg host.cfg target.cfg bsp.cfg
-DATA =  $(noinst_DATA) $(rtems_bsp_DATA) $(rtems_make_DATA)
+DATA =  $(noinst_DATA) $(rtems_bsp_DATA) $(rtems_bsp_make_DATA) \
+$(rtems_make_DATA)
 
 DIST_COMMON =  Makefile.am Makefile.in Makefile.inc.in aclocal.m4 \
-configure configure.in host.cfg.in main.cfg.in target.cfg.in
+bsp.cfg.in configure configure.in host.cfg.in main.cfg.in target.cfg.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -181,6 +188,8 @@ host.cfg: $(top_builddir)/config.status host.cfg.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 target.cfg: $(top_builddir)/config.status target.cfg.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+bsp.cfg: $(top_builddir)/config.status bsp.cfg.in
+	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 install-rtems_bspDATA: $(rtems_bsp_DATA)
 	@$(NORMAL_INSTALL)
@@ -201,6 +210,25 @@ uninstall-rtems_bspDATA:
 	  rm -f $(DESTDIR)$(rtems_bspdir)/$$p; \
 	done
 
+install-rtems_bsp_makeDATA: $(rtems_bsp_make_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(rtems_bsp_makedir)
+	@list='$(rtems_bsp_make_DATA)'; for p in $$list; do \
+	  if test -f $(srcdir)/$$p; then \
+	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rtems_bsp_makedir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(rtems_bsp_makedir)/$$p; \
+	  else if test -f $$p; then \
+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(rtems_bsp_makedir)/$$p"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(rtems_bsp_makedir)/$$p; \
+	  fi; fi; \
+	done
+
+uninstall-rtems_bsp_makeDATA:
+	@$(NORMAL_UNINSTALL)
+	list='$(rtems_bsp_make_DATA)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(rtems_bsp_makedir)/$$p; \
+	done
+
 install-rtems_makeDATA: $(rtems_make_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(rtems_makedir)
@@ -383,13 +411,15 @@ installcheck: installcheck-recursive
 install-exec-am:
 install-exec: install-exec-recursive
 
-install-data-am: install-rtems_bspDATA install-rtems_makeDATA
+install-data-am: install-rtems_bspDATA install-rtems_bsp_makeDATA \
+		install-rtems_makeDATA
 install-data: install-data-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-recursive
-uninstall-am: uninstall-rtems_bspDATA uninstall-rtems_makeDATA
+uninstall-am: uninstall-rtems_bspDATA uninstall-rtems_bsp_makeDATA \
+		uninstall-rtems_makeDATA
 uninstall: uninstall-recursive
 all-am: Makefile $(DATA)
 all-redirect: all-recursive
@@ -397,7 +427,9 @@ install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(rtems_bspdir) $(DESTDIR)$(rtems_makedir)
+	$(mkinstalldirs)  $(DESTDIR)$(rtems_bspdir) \
+		$(DESTDIR)$(rtems_bsp_makedir) \
+		$(DESTDIR)$(rtems_makedir)
 
 
 mostlyclean-generic:
@@ -431,6 +463,7 @@ maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status
 
 .PHONY: uninstall-rtems_bspDATA install-rtems_bspDATA \
+uninstall-rtems_bsp_makeDATA install-rtems_bsp_makeDATA \
 uninstall-rtems_makeDATA install-rtems_makeDATA install-data-recursive \
 uninstall-data-recursive install-exec-recursive \
 uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \

c/src/make/Templates/Makefile.in

@@ -86,6 +86,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXX_FOR_TARGET = @CXX_FOR_TARGET@
 GCCSED = @GCCSED@
+HAS_MP = @HAS_MP@
+HAS_RDBG = @HAS_RDBG@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 KSH = @KSH@
 LN = @LN@

c/src/make/aclocal.m4

@@ -937,18 +937,47 @@ else
 fi
 ])dnl
 
+dnl $Id$
+
+AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
+[dnl
+AC_REQUIRE([RTEMS_TOP])dnl
+AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_CACHE_CHECK([whether BSP supports multiprocessing],
+  rtems_cv_HAS_MP,
+  [dnl
+    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${$1}/shmsupp"; then
+      if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
+        rtems_cv_HAS_MP="yes" ;
+      else
+        rtems_cv_HAS_MP="disabled";
+      fi
+    else
+      rtems_cv_HAS_MP="no";
+    fi
+  ])
+if test "$rtems_cv_HAS_MP" = "yes"; then
+HAS_MP="yes"
+else
+HAS_MP="no"
+fi
+AC_SUBST(HAS_MP)
+])
+
 AC_DEFUN(RTEMS_CHECK_RDBG,
 [dnl
 AC_REQUIRE([RTEMS_TOP])dnl
 AC_REQUIRE([RTEMS_CHECK_CPU])dnl
-AC_CACHE_CHECK([whether cpu supports librdbg],
+AC_CACHE_CHECK([whether BSP supports librdbg],
-  rtems_cv_has_rdbg,
+  rtems_cv_HAS_RDBG,
   [
-    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/librdbg/${RTEMS_CPU}"; then
+    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/librdbg/${RTEMS_CPU}/${$1}"; then
-      rtems_cv_has_rdbg="yes" ;
+      rtems_cv_HAS_RDBG="yes" ;
     else
-      rtems_cv_has_rdbg="no";
+      rtems_cv_HAS_RDBG="no";
     fi
   ])
+HAS_RDBG="$rtems_cv_HAS_RDBG"
+AC_SUBST(HAS_RDBG)
 ])
 

c/src/make/bsp.cfg.in

@@ -0,0 +1,9 @@
+##
+## Does this BSP support multiprocessing ?
+##
+HAS_MP = @HAS_MP@
+
+##
+## Does this BSP support RTEMS's remote debugger ?
+##
+HAS_RDBG = @HAS_RDBG@

c/src/make/compilers/Makefile.in

@@ -86,6 +86,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXX_FOR_TARGET = @CXX_FOR_TARGET@
 GCCSED = @GCCSED@
+HAS_MP = @HAS_MP@
+HAS_RDBG = @HAS_RDBG@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 KSH = @KSH@
 LN = @LN@

c/src/make/configure

@@ -2921,37 +2921,58 @@ echo "$ac_t""$rtems_cv_prog_gas_code16" 1>&6
   
 
 
-
 echo $ac_n "checking for make/custom/$RTEMS_BSP.cfg""... $ac_c" 1>&6
-echo "configure:2927: checking for make/custom/$RTEMS_BSP.cfg" >&5
+echo "configure:2926: checking for make/custom/$RTEMS_BSP.cfg" >&5
 if test -r "$srcdir/$RTEMS_TOPdir/make/custom/$RTEMS_BSP.cfg"; then
   echo "$ac_t""yes" 1>&6
 else
   { echo "configure: error: no" 1>&2; exit 1; }
 fi
 
-
+echo $ac_n "checking whether BSP supports multiprocessing""... $ac_c" 1>&6
-if test "$RTEMS_HAS_RDBG" = "yes"; then
+echo "configure:2934: checking whether BSP supports multiprocessing" >&5
-  echo $ac_n "checking whether cpu supports librdbg""... $ac_c" 1>&6
+if eval "test \"`echo '$''{'rtems_cv_HAS_MP'+set}'`\" = set"; then
-echo "configure:2937: checking whether cpu supports librdbg" >&5
-if eval "test \"`echo '$''{'rtems_cv_has_rdbg'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
+      if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP}/shmsupp"; then
-    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/librdbg/${RTEMS_CPU}"; then
+      if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
-      rtems_cv_has_rdbg="yes" ;
+        rtems_cv_HAS_MP="yes" ;
+      else
+        rtems_cv_HAS_MP="disabled";
+      fi
     else
-      rtems_cv_has_rdbg="no";
+      rtems_cv_HAS_MP="no";
     fi
   
 fi
 
-echo "$ac_t""$rtems_cv_has_rdbg" 1>&6
+echo "$ac_t""$rtems_cv_HAS_MP" 1>&6
-
+if test "$rtems_cv_HAS_MP" = "yes"; then
-  RTEMS_HAS_RDBG="$rtems_cv_has_rdbg";
+HAS_MP="yes"
+else
+HAS_MP="no"
 fi
 
 
+echo $ac_n "checking whether BSP supports librdbg""... $ac_c" 1>&6
+echo "configure:2959: checking whether BSP supports librdbg" >&5
+if eval "test \"`echo '$''{'rtems_cv_HAS_RDBG'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/librdbg/${RTEMS_CPU}/${RTEMS_BSP}"; then
+      rtems_cv_HAS_RDBG="yes" ;
+    else
+      rtems_cv_HAS_RDBG="no";
+    fi
+  
+fi
+
+echo "$ac_t""$rtems_cv_HAS_RDBG" 1>&6
+HAS_RDBG="$rtems_cv_HAS_RDBG"
+
+
+
 
 
 
@@ -3113,6 +3134,7 @@ Makefile.inc
 main.cfg
 host.cfg
 target.cfg
+bsp.cfg
 Templates/Makefile
 custom/Makefile
 custom/default.cfg
@@ -3219,6 +3241,8 @@ s%@OBJCOPY_FOR_TARGET@%$OBJCOPY_FOR_TARGET%g
 s%@SIZE_FOR_TARGET@%$SIZE_FOR_TARGET%g
 s%@STRIP_FOR_TARGET@%$STRIP_FOR_TARGET%g
 s%@RTEMS_GAS_CODE16@%$RTEMS_GAS_CODE16%g
+s%@HAS_MP@%$HAS_MP%g
+s%@HAS_RDBG@%$HAS_RDBG%g
 s%@rtems_cv_prog_cc_cross@%$rtems_cv_prog_cc_cross%g
 s%@RTEMS_HAS_CPLUSPLUS@%$RTEMS_HAS_CPLUSPLUS%g
 s%@RTEMS_USE_GCC272@%$RTEMS_USE_GCC272%g
@@ -3276,6 +3300,7 @@ Makefile.inc
 main.cfg
 host.cfg
 target.cfg
+bsp.cfg
 Templates/Makefile
 custom/Makefile
 custom/default.cfg

c/src/make/configure.in

@@ -26,7 +26,6 @@ RTEMS_ENABLE_CXX
 RTEMS_ENABLE_GCC28
 RTEMS_ENABLE_LIBCDIR
 RTEMS_ENABLE_BARE
-dnl RTEMS_ENABLE_RTEMSBSP
 
 RTEMS_ENV_RTEMSBSP
 
@@ -71,16 +70,9 @@ RTEMS_CANONICALIZE_TOOLS
 dnl if this is an i386, does gas have good code16 support?
 RTEMS_I386_GAS_CODE16
 
-dnl RTEMS_CHECK_BSPS(rtems_bsp)
-
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
-if test "$RTEMS_HAS_RDBG" = "yes"; then
+RTEMS_CHECK_RDBG(RTEMS_BSP)
-  RTEMS_CHECK_RDBG
-  RTEMS_HAS_RDBG="$rtems_cv_has_rdbg";
-fi
-
-dnl END configure.target.in
 
 AC_SUBST(rtems_cv_prog_cc_cross)
 AC_SUBST(RTEMS_HAS_CPLUSPLUS)
@@ -131,6 +123,7 @@ Makefile.inc
 main.cfg
 host.cfg
 target.cfg
+bsp.cfg
 Templates/Makefile
 custom/Makefile
 custom/default.cfg

c/src/make/custom/Makefile.am

@@ -13,7 +13,9 @@ default.cfg
 
 if MAINTAINER_MODE
 $(srcdir)/default.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/custom/default.cfg
-	sed -e 's%\$$(RTEMS_BSP)%\@RTEMS_BSP\@%g' < $< >$@
+	sed -e 's%\$$(RTEMS_BSP)%\@RTEMS_BSP\@%g' \
+	-e 's%\$$(RTEMS_ROOT)/\@RTEMS_BSP\@%$$(RTEMS_ROOT)%g' \
+	< $< >$@
 endif
 
 include $(top_srcdir)/../../../automake/local.am

c/src/make/custom/Makefile.in

@@ -86,6 +86,8 @@ CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXX_FOR_TARGET = @CXX_FOR_TARGET@
 GCCSED = @GCCSED@
+HAS_MP = @HAS_MP@
+HAS_RDBG = @HAS_RDBG@
 INSTALL_CHANGE = @INSTALL_CHANGE@
 KSH = @KSH@
 LN = @LN@
@@ -256,7 +258,9 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 @MAINTAINER_MODE_TRUE@$(srcdir)/default.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/custom/default.cfg
-@MAINTAINER_MODE_TRUE@	sed -e 's%\$$(RTEMS_BSP)%\@RTEMS_BSP\@%g' < $< >$@
+@MAINTAINER_MODE_TRUE@	sed -e 's%\$$(RTEMS_BSP)%\@RTEMS_BSP\@%g' \
+@MAINTAINER_MODE_TRUE@	-e 's%\$$(RTEMS_ROOT)/\@RTEMS_BSP\@%$$(RTEMS_ROOT)%g' \
+@MAINTAINER_MODE_TRUE@	< $< >$@
 
 debug-am:
 debug: debug-am

c/src/make/custom/default.cfg.in

@@ -18,6 +18,7 @@ TARGET_ARCH=o-@RTEMS_BSP@
 endif
 
 include $(RTEMS_ROOT)/make/main.cfg
+include $(RTEMS_ROOT)/make/bsp.cfg
 
 # use the inline functions instead of the macros
 # ref: src/exec/generic/Makefile
@@ -53,13 +54,6 @@ else
 HAS_CPLUSPLUS=no
 endif
 
-# Define this to yes if this target supports multiprocessor environments.
-ifeq ($(RTEMS_HAS_MULTIPROCESSING),yes)
-HAS_MP=yes
-else
-HAS_MP=no
-endif
-
 # Define this to yes if this target wants the TCP/IP stack
 ifeq ($(RTEMS_HAS_NETWORKING),yes)
 HAS_NETWORKING=yes
@@ -67,13 +61,6 @@ else
 HAS_NETWORKING=no
 endif
 
-# Define this to yes if this target wants the remote debugger
-ifeq ($(RTEMS_HAS_RDBG),yes)
-HAS_RDBG=yes
-else
-HAS_RDBG=no
-endif
-
 # Define this to yes if this target wants the posix api
 ifeq ($(RTEMS_HAS_POSIX_API),yes)
 HAS_POSIX_API=yes

c/src/make/main.cfg.in

@@ -42,10 +42,7 @@ MAKEFILE=Makefile
 
 #
 # Target variant names
-# and rule to expand them into (for example): sun4 sun4-debug sun4-profile
-# Note compiler config may add to TARGET_VARIANTS
 #
-
 TARGET_VARIANTS = debug profile
 
 #

c/src/tests/aclocal.m4

@@ -948,6 +948,33 @@ else
 fi
 ])dnl
 
+dnl $Id$
+
+AC_DEFUN(RTEMS_CHECK_MULTIPROCESSING,
+[dnl
+AC_REQUIRE([RTEMS_TOP])dnl
+AC_REQUIRE([RTEMS_CHECK_CPU])dnl
+AC_CACHE_CHECK([whether BSP supports multiprocessing],
+  rtems_cv_HAS_MP,
+  [dnl
+    if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${$1}/shmsupp"; then
+      if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
+        rtems_cv_HAS_MP="yes" ;
+      else
+        rtems_cv_HAS_MP="disabled";
+      fi
+    else
+      rtems_cv_HAS_MP="no";
+    fi
+  ])
+if test "$rtems_cv_HAS_MP" = "yes"; then
+HAS_MP="yes"
+else
+HAS_MP="no"
+fi
+AC_SUBST(HAS_MP)
+])
+
 dnl
 dnl $Id$
 dnl

c/src/tests/configure

@@ -955,41 +955,6 @@ echo "$ac_t""${RTEMS_BSP}" 1>&6
 
 
 
-# Extract the first word of "rm", so it can be a program name with args.
-set dummy rm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:962: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$RM" in
-  /*)
-  ac_cv_path_RM="$RM" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_RM="$RM" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_RM="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-fi
-RM="$ac_cv_path_RM"
-if test -n "$RM"; then
-  echo "$ac_t""$RM" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1002,7 +967,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1006: checking for a BSD compatible install" >&5
+echo "configure:971: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1060,7 +1025,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 # Is this a supported CPU?
 echo $ac_n "checking if cpu $RTEMS_CPU is supported""... $ac_c" 1>&6
-echo "configure:1064: checking if cpu $RTEMS_CPU is supported" >&5
+echo "configure:1029: checking if cpu $RTEMS_CPU is supported" >&5
 if test -d "$srcdir/$RTEMS_TOPdir/c/src/exec/score/cpu/$RTEMS_CPU"; then
   echo "$ac_t""yes" 1>&6
 else
@@ -1121,7 +1086,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1125: checking for $ac_word" >&5
+echo "configure:1090: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CC_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1165,7 +1130,7 @@ rtems_save_CFLAGS=$CFLAGS
 CC=$CC_FOR_TARGET
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1169: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1134: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1176,12 +1141,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1180 "configure"
+#line 1145 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1207,12 +1172,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1211: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1176: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1216: checking whether we are using GNU C" >&5
+echo "configure:1181: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1221,7 +1186,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1236,7 +1201,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1240: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1205: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1278,7 +1243,7 @@ unset ac_cv_prog_cc_cross
 
 
 echo $ac_n "checking whether $CC_FOR_TARGET accepts -specs""... $ac_c" 1>&6
-echo "configure:1282: checking whether $CC_FOR_TARGET accepts -specs" >&5
+echo "configure:1247: checking whether $CC_FOR_TARGET accepts -specs" >&5
 if eval "test \"`echo '$''{'rtems_cv_gcc_specs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1299,7 +1264,7 @@ echo "$ac_t""$rtems_cv_gcc_specs" 1>&6
  
 
 echo $ac_n "checking whether $CC_FOR_TARGET accepts --pipe""... $ac_c" 1>&6
-echo "configure:1303: checking whether $CC_FOR_TARGET accepts --pipe" >&5
+echo "configure:1268: checking whether $CC_FOR_TARGET accepts --pipe" >&5
 if eval "test \"`echo '$''{'rtems_cv_gcc_pipe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1347,7 +1312,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1351: checking for $ac_word" >&5
+echo "configure:1316: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CXX_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1391,7 +1356,7 @@ rtems_save_CXXFLAGS=$CXXFLAGS
 CXX=$CXX_FOR_TARGET
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1395: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1360: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1402,12 +1367,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1406 "configure"
+#line 1371 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:1411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1433,12 +1398,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1437: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1402: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1442: checking whether we are using GNU C++" >&5
+echo "configure:1407: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1447,7 +1412,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -1462,7 +1427,7 @@ if test $ac_cv_prog_gxx = yes; then
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=
   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1466: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1431: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1515,7 +1480,7 @@ fi
 
   
 echo $ac_n "checking target's ar""... $ac_c" 1>&6
-echo "configure:1519: checking target's ar" >&5
+echo "configure:1484: checking target's ar" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1548,7 +1513,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable AR_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:1552: checking whether environment variable AR_FOR_TARGET is an absolute path" >&5
+echo "configure:1517: checking whether environment variable AR_FOR_TARGET is an absolute path" >&5
     case "$AR_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -1565,7 +1530,7 @@ echo "configure:1552: checking whether environment variable AR_FOR_TARGET is an
   # Extract the first word of ""$program_prefix"ar", so it can be a program name with args.
 set dummy "$program_prefix"ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1569: checking for $ac_word" >&5
+echo "configure:1534: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1602,7 +1567,7 @@ fi
 
   
 echo $ac_n "checking target's as""... $ac_c" 1>&6
-echo "configure:1606: checking target's as" >&5
+echo "configure:1571: checking target's as" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1635,7 +1600,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable AS_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:1639: checking whether environment variable AS_FOR_TARGET is an absolute path" >&5
+echo "configure:1604: checking whether environment variable AS_FOR_TARGET is an absolute path" >&5
     case "$AS_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -1652,7 +1617,7 @@ echo "configure:1639: checking whether environment variable AS_FOR_TARGET is an
   # Extract the first word of ""$program_prefix"as", so it can be a program name with args.
 set dummy "$program_prefix"as; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1656: checking for $ac_word" >&5
+echo "configure:1621: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1689,7 +1654,7 @@ fi
 
   
 echo $ac_n "checking target's ld""... $ac_c" 1>&6
-echo "configure:1693: checking target's ld" >&5
+echo "configure:1658: checking target's ld" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1722,7 +1687,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable LD_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:1726: checking whether environment variable LD_FOR_TARGET is an absolute path" >&5
+echo "configure:1691: checking whether environment variable LD_FOR_TARGET is an absolute path" >&5
     case "$LD_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -1739,7 +1704,7 @@ echo "configure:1726: checking whether environment variable LD_FOR_TARGET is an
   # Extract the first word of ""$program_prefix"ld", so it can be a program name with args.
 set dummy "$program_prefix"ld; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1743: checking for $ac_word" >&5
+echo "configure:1708: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1776,7 +1741,7 @@ fi
 
   
 echo $ac_n "checking target's nm""... $ac_c" 1>&6
-echo "configure:1780: checking target's nm" >&5
+echo "configure:1745: checking target's nm" >&5
 if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1809,7 +1774,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable NM_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:1813: checking whether environment variable NM_FOR_TARGET is an absolute path" >&5
+echo "configure:1778: checking whether environment variable NM_FOR_TARGET is an absolute path" >&5
     case "$NM_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -1826,7 +1791,7 @@ echo "configure:1813: checking whether environment variable NM_FOR_TARGET is an
   # Extract the first word of ""$program_prefix"nm", so it can be a program name with args.
 set dummy "$program_prefix"nm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1830: checking for $ac_word" >&5
+echo "configure:1795: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1864,7 +1829,7 @@ fi
 
   
 echo $ac_n "checking target's ranlib""... $ac_c" 1>&6
-echo "configure:1868: checking target's ranlib" >&5
+echo "configure:1833: checking target's ranlib" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1897,7 +1862,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable RANLIB_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:1901: checking whether environment variable RANLIB_FOR_TARGET is an absolute path" >&5
+echo "configure:1866: checking whether environment variable RANLIB_FOR_TARGET is an absolute path" >&5
     case "$RANLIB_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -1914,7 +1879,7 @@ echo "configure:1901: checking whether environment variable RANLIB_FOR_TARGET is
   # Extract the first word of ""$program_prefix"ranlib", so it can be a program name with args.
 set dummy "$program_prefix"ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1918: checking for $ac_word" >&5
+echo "configure:1883: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1953,7 +1918,7 @@ fi
     # ranlib wasn't found; check if ar -s is available
     
 echo $ac_n "checking whether $AR_FOR_TARGET -s works""... $ac_c" 1>&6
-echo "configure:1957: checking whether $AR_FOR_TARGET -s works" >&5
+echo "configure:1922: checking whether $AR_FOR_TARGET -s works" >&5
 if eval "test \"`echo '$''{'rtems_cv_AR_FOR_TARGET_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1962,8 +1927,8 @@ cat > conftest.$ac_ext <<EOF
 int foo( int b ) 
 { return b; }
 EOF
-if { ac_try='$CC_FOR_TARGET -o conftest.o -c conftest.$ac_ext'; { (eval echo configure:1966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \
+if { ac_try='$CC_FOR_TARGET -o conftest.o -c conftest.$ac_ext'; { (eval echo configure:1931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \
-  && { ac_try='$AR_FOR_TARGET -sr conftest.a conftest.o'; { (eval echo configure:1967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \
+  && { ac_try='$AR_FOR_TARGET -sr conftest.a conftest.o'; { (eval echo configure:1932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \
   && test -s conftest.a ; \
 then
   rtems_cv_AR_FOR_TARGET_S="yes"
@@ -1988,7 +1953,7 @@ echo "$ac_t""$rtems_cv_AR_FOR_TARGET_S" 1>&6
 
   
 echo $ac_n "checking target's objcopy""... $ac_c" 1>&6
-echo "configure:1992: checking target's objcopy" >&5
+echo "configure:1957: checking target's objcopy" >&5
 if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2021,7 +1986,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:2025: checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path" >&5
+echo "configure:1990: checking whether environment variable OBJCOPY_FOR_TARGET is an absolute path" >&5
     case "$OBJCOPY_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -2038,7 +2003,7 @@ echo "configure:2025: checking whether environment variable OBJCOPY_FOR_TARGET i
   # Extract the first word of ""$program_prefix"objcopy", so it can be a program name with args.
 set dummy "$program_prefix"objcopy; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2042: checking for $ac_word" >&5
+echo "configure:2007: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2075,7 +2040,7 @@ fi
 
   
 echo $ac_n "checking target's size""... $ac_c" 1>&6
-echo "configure:2079: checking target's size" >&5
+echo "configure:2044: checking target's size" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SIZE_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2108,7 +2073,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable SIZE_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:2112: checking whether environment variable SIZE_FOR_TARGET is an absolute path" >&5
+echo "configure:2077: checking whether environment variable SIZE_FOR_TARGET is an absolute path" >&5
     case "$SIZE_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -2125,7 +2090,7 @@ echo "configure:2112: checking whether environment variable SIZE_FOR_TARGET is a
   # Extract the first word of ""$program_prefix"size", so it can be a program name with args.
 set dummy "$program_prefix"size; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2129: checking for $ac_word" >&5
+echo "configure:2094: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SIZE_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2162,7 +2127,7 @@ fi
 
   
 echo $ac_n "checking target's strip""... $ac_c" 1>&6
-echo "configure:2166: checking target's strip" >&5
+echo "configure:2131: checking target's strip" >&5
 if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2195,7 +2160,7 @@ else
     # will override the environment variable, which isn't what the user
     # intends
     echo $ac_n "checking whether environment variable STRIP_FOR_TARGET is an absolute path""... $ac_c" 1>&6
-echo "configure:2199: checking whether environment variable STRIP_FOR_TARGET is an absolute path" >&5
+echo "configure:2164: checking whether environment variable STRIP_FOR_TARGET is an absolute path" >&5
     case "$STRIP_FOR_TARGET" in
     /*) # valid
       echo "$ac_t"""yes"" 1>&6
@@ -2212,7 +2177,7 @@ echo "configure:2199: checking whether environment variable STRIP_FOR_TARGET is
   # Extract the first word of ""$program_prefix"strip", so it can be a program name with args.
 set dummy "$program_prefix"strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2216: checking for $ac_word" >&5
+echo "configure:2181: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_STRIP_FOR_TARGET'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2251,7 +2216,7 @@ fi
 
  if test "${target_cpu}" = "i386"; then
     echo $ac_n "checking for 16 bit mode assembler support""... $ac_c" 1>&6
-echo "configure:2255: checking for 16 bit mode assembler support" >&5
+echo "configure:2220: checking for 16 bit mode assembler support" >&5
 if eval "test \"`echo '$''{'rtems_cv_prog_gas_code16'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2261,7 +2226,7 @@ else
          addr32
          lgdt 0
 EOF
-      if { ac_try='$AS_FOR_TARGET -o conftest.o conftest.s'; { (eval echo configure:2265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+      if { ac_try='$AS_FOR_TARGET -o conftest.o conftest.s'; { (eval echo configure:2230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
         rtems_cv_prog_gas_code16=yes
       else
         rtems_cv_prog_gas_code16=no
@@ -2277,7 +2242,7 @@ echo "$ac_t""$rtems_cv_prog_gas_code16" 1>&6
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2281: checking for $ac_word" >&5
+echo "configure:2246: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2307,7 +2272,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2311: checking for $ac_word" >&5
+echo "configure:2276: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2358,7 +2323,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2362: checking for $ac_word" >&5
+echo "configure:2327: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2390,7 +2355,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2394: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2359: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -2401,12 +2366,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 2405 "configure"
+#line 2370 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2432,12 +2397,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2436: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2401: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2441: checking whether we are using GNU C" >&5
+echo "configure:2406: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2446,7 +2411,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2465,7 +2430,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2469: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2434: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2501,7 +2466,7 @@ if test "$RTEMS_CPU" = "unix" ; then
    
 
 echo $ac_n "checking whether $RTEMS_HOST supports System V semaphores""... $ac_c" 1>&6
-echo "configure:2505: checking whether $RTEMS_HOST supports System V semaphores" >&5
+echo "configure:2470: checking whether $RTEMS_HOST supports System V semaphores" >&5
 if eval "test \"`echo '$''{'rtems_cv_sysv_sem'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2510,7 +2475,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2514 "configure"
+#line 2479 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2536,7 +2501,7 @@ int main () {
 }
 
 EOF
-if { (eval echo configure:2540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   rtems_cv_sysv_sem="yes"
 else
@@ -2559,7 +2524,7 @@ echo "$ac_t""$rtems_cv_sysv_sem" 1>&6
    
 
 echo $ac_n "checking whether $RTEMS_HOST supports System V shared memory""... $ac_c" 1>&6
-echo "configure:2563: checking whether $RTEMS_HOST supports System V shared memory" >&5
+echo "configure:2528: checking whether $RTEMS_HOST supports System V shared memory" >&5
 if eval "test \"`echo '$''{'rtems_cv_sysv_shm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2568,7 +2533,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2572 "configure"
+#line 2537 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2584,7 +2549,7 @@ int main () {
 }
 
 EOF
-if { (eval echo configure:2588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   rtems_cv_sysv_shm="yes"
 else
@@ -2607,7 +2572,7 @@ echo "$ac_t""$rtems_cv_sysv_shm" 1>&6
    
 
 echo $ac_n "checking whether $RTEMS_HOST supports System V messages""... $ac_c" 1>&6
-echo "configure:2611: checking whether $RTEMS_HOST supports System V messages" >&5
+echo "configure:2576: checking whether $RTEMS_HOST supports System V messages" >&5
 if eval "test \"`echo '$''{'rtems_cv_sysv_msg'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2616,7 +2581,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 2620 "configure"
+#line 2585 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2632,7 +2597,7 @@ int main () {
 }
 
 EOF
-if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   rtems_cv_sysv_msg="yes"
 else
@@ -2656,20 +2621,53 @@ fi
 
 
 echo $ac_n "checking for make/custom/$RTEMS_BSP.cfg""... $ac_c" 1>&6
-echo "configure:2660: checking for make/custom/$RTEMS_BSP.cfg" >&5
+echo "configure:2625: checking for make/custom/$RTEMS_BSP.cfg" >&5
 if test -r "$srcdir/$RTEMS_TOPdir/make/custom/$RTEMS_BSP.cfg"; then
   echo "$ac_t""yes" 1>&6
 else
   { echo "configure: error: no" 1>&2; exit 1; }
 fi
 
+echo $ac_n "checking whether BSP supports multiprocessing""... $ac_c" 1>&6
+echo "configure:2633: checking whether BSP supports multiprocessing" >&5
+if eval "test \"`echo '$''{'rtems_cv_HAS_MP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+      if test -d "$srcdir/${RTEMS_TOPdir}/c/src/lib/libbsp/${RTEMS_CPU}/${RTEMS_BSP}/shmsupp"; then
+      if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
+        rtems_cv_HAS_MP="yes" ;
+      else
+        rtems_cv_HAS_MP="disabled";
+      fi
+    else
+      rtems_cv_HAS_MP="no";
+    fi
+  
+fi
+
+echo "$ac_t""$rtems_cv_HAS_MP" 1>&6
+if test "$rtems_cv_HAS_MP" = "yes"; then
+HAS_MP="yes"
+else
+HAS_MP="no"
+fi
+
+
 
 # always build the test tools
 testtools_cfgdirs="tools/generic"
+
+if test "$HAS_MP" = "yes"; then
+    makefiles="$makefiles samples/base_mp/Makefile"
+    makefiles="$makefiles samples/base_mp/node1/Makefile"
+    makefiles="$makefiles samples/base_mp/node2/Makefile"
+    makefiles="$makefiles samples/base_sp/Makefile"
+fi
+
 if test "$tests_enabled" = "yes"; then
-   
+  
 echo $ac_n "checking for Makefile.in in libtests""... $ac_c" 1>&6
-echo "configure:2673: checking for Makefile.in in libtests" >&5
+echo "configure:2671: checking for Makefile.in in libtests" >&5
 if test -d $srcdir/libtests; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2682,9 +2680,9 @@ else
 fi
 
 
-   
+  
 echo $ac_n "checking for Makefile.in in sptests""... $ac_c" 1>&6
-echo "configure:2688: checking for Makefile.in in sptests" >&5
+echo "configure:2686: checking for Makefile.in in sptests" >&5
 if test -d $srcdir/sptests; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2697,9 +2695,9 @@ else
 fi
 
 
-   
+  
 echo $ac_n "checking for Makefile.in in tmtests""... $ac_c" 1>&6
-echo "configure:2703: checking for Makefile.in in tmtests" >&5
+echo "configure:2701: checking for Makefile.in in tmtests" >&5
 if test -d $srcdir/tmtests; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2712,10 +2710,10 @@ else
 fi
 
 
-   if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
+  if test "$HAS_MP" = "yes"; then
-       
+    
 echo $ac_n "checking for Makefile.in in mptests""... $ac_c" 1>&6
-echo "configure:2719: checking for Makefile.in in mptests" >&5
+echo "configure:2717: checking for Makefile.in in mptests" >&5
 if test -d $srcdir/mptests; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2728,11 +2726,11 @@ else
 fi
 
 
-   fi
+  fi
-   if test "$RTEMS_HAS_POSIX_API" = "yes"; then
+  if test "$RTEMS_HAS_POSIX_API" = "yes"; then
-     
+    
 echo $ac_n "checking for Makefile.in in psxtests""... $ac_c" 1>&6
-echo "configure:2736: checking for Makefile.in in psxtests" >&5
+echo "configure:2734: checking for Makefile.in in psxtests" >&5
 if test -d $srcdir/psxtests; then
   rtems_av_save_dir=`pwd`;
   cd $srcdir;
@@ -2745,7 +2743,7 @@ else
 fi
 
 
-   fi
+  fi
    if test -d "$srcdir/tools/$RTEMS_CPU"; then
      testtools_cfgdirs="$testtools_cfgdirs tools/$RTEMS_CPU"
    fi
@@ -2886,9 +2884,6 @@ support/stubdr/Makefile
 support/wrapup/Makefile
 tools/Makefile
 samples/Makefile
-samples/base_mp/Makefile
-samples/base_mp/node1/Makefile
-samples/base_mp/node2/Makefile
 samples/base_sp/Makefile
 samples/cdtest/Makefile
 samples/hello/Makefile
@@ -2956,7 +2951,6 @@ s%@RTEMS_HAS_RDBG@%$RTEMS_HAS_RDBG%g
 s%@RTEMS_USE_MACROS@%$RTEMS_USE_MACROS%g
 s%@RTEMS_LIBC_DIR@%$RTEMS_LIBC_DIR%g
 s%@RTEMS_BSP@%$RTEMS_BSP%g
-s%@RM@%$RM%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -2978,6 +2972,7 @@ s%@SIZE_FOR_TARGET@%$SIZE_FOR_TARGET%g
 s%@STRIP_FOR_TARGET@%$STRIP_FOR_TARGET%g
 s%@RTEMS_GAS_CODE16@%$RTEMS_GAS_CODE16%g
 s%@CC@%$CC%g
+s%@HAS_MP@%$HAS_MP%g
 s%@rtems_cv_prog_cc_cross@%$rtems_cv_prog_cc_cross%g
 s%@RTEMS_HAS_CPLUSPLUS@%$RTEMS_HAS_CPLUSPLUS%g
 s%@RTEMS_USE_GCC272@%$RTEMS_USE_GCC272%g
@@ -3037,9 +3032,6 @@ support/stubdr/Makefile
 support/wrapup/Makefile
 tools/Makefile
 samples/Makefile
-samples/base_mp/Makefile
-samples/base_mp/node1/Makefile
-samples/base_mp/node2/Makefile
 samples/base_sp/Makefile
 samples/cdtest/Makefile
 samples/hello/Makefile

c/src/tests/configure.in

@@ -28,7 +28,6 @@ RTEMS_ENV_RTEMSBSP
 
 dnl BEGIN configure.host.in
 
-AC_PATH_PROG(RM,rm)
 AC_PROG_INSTALL
 
 dnl BEGIN configure.target.in
@@ -54,19 +53,28 @@ RTEMS_I386_GAS_CODE16
 RTEMS_CHECK_SYSV_UNIX
 
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 
 # always build the test tools
 testtools_cfgdirs="tools/generic"
+
+if test "$HAS_MP" = "yes"; then
+    makefiles="$makefiles samples/base_mp/Makefile"
+    makefiles="$makefiles samples/base_mp/node1/Makefile"
+    makefiles="$makefiles samples/base_mp/node2/Makefile"
+    makefiles="$makefiles samples/base_sp/Makefile"
+fi
+
 if test "$tests_enabled" = "yes"; then
-   RTEMS_CHECK_MAKEFILE(libtests)
+  RTEMS_CHECK_MAKEFILE(libtests)
-   RTEMS_CHECK_MAKEFILE(sptests)
+  RTEMS_CHECK_MAKEFILE(sptests)
-   RTEMS_CHECK_MAKEFILE(tmtests)
+  RTEMS_CHECK_MAKEFILE(tmtests)
-   if test "$RTEMS_HAS_MULTIPROCESSING" = "yes"; then
+  if test "$HAS_MP" = "yes"; then
-       RTEMS_CHECK_MAKEFILE(mptests)
+    RTEMS_CHECK_MAKEFILE(mptests)
-   fi
+  fi
-   if test "$RTEMS_HAS_POSIX_API" = "yes"; then
+  if test "$RTEMS_HAS_POSIX_API" = "yes"; then
-     RTEMS_CHECK_MAKEFILE(psxtests)
+    RTEMS_CHECK_MAKEFILE(psxtests)
-   fi
+  fi
    if test -d "$srcdir/tools/$RTEMS_CPU"; then
      testtools_cfgdirs="$testtools_cfgdirs tools/$RTEMS_CPU"
    fi
@@ -94,9 +102,6 @@ support/stubdr/Makefile
 support/wrapup/Makefile
 tools/Makefile
 samples/Makefile
-samples/base_mp/Makefile
-samples/base_mp/node1/Makefile
-samples/base_mp/node2/Makefile
 samples/base_sp/Makefile
 samples/cdtest/Makefile
 samples/hello/Makefile

make/custom/default.cfg

@@ -18,6 +18,7 @@ TARGET_ARCH=o-$(RTEMS_BSP)
 endif
 
 include $(RTEMS_ROOT)/make/main.cfg
+include $(RTEMS_ROOT)/$(RTEMS_BSP)/make/bsp.cfg
 
 # use the inline functions instead of the macros
 # ref: src/exec/generic/Makefile
@@ -53,13 +54,6 @@ else
 HAS_CPLUSPLUS=no
 endif
 
-# Define this to yes if this target supports multiprocessor environments.
-ifeq ($(RTEMS_HAS_MULTIPROCESSING),yes)
-HAS_MP=yes
-else
-HAS_MP=no
-endif
-
 # Define this to yes if this target wants the TCP/IP stack
 ifeq ($(RTEMS_HAS_NETWORKING),yes)
 HAS_NETWORKING=yes
@@ -67,13 +61,6 @@ else
 HAS_NETWORKING=no
 endif
 
-# Define this to yes if this target wants the remote debugger
-ifeq ($(RTEMS_HAS_RDBG),yes)
-HAS_RDBG=yes
-else
-HAS_RDBG=no
-endif
-
 # Define this to yes if this target wants the posix api
 ifeq ($(RTEMS_HAS_POSIX_API),yes)
 HAS_POSIX_API=yes

make/custom/force386.cfg

@@ -26,9 +26,6 @@ CFLAGS_OPTIMIZE_V=-O4
 # to enable it.
 HAS_NETWORKING=no
 
-# This BSP does not support librdbg
-HAS_RDBG=no
-
 #  This section makes the target dependent options file.
 
 #  NDEBUG (C library)

make/custom/i386ex.cfg

@@ -22,9 +22,6 @@ CPU_CFLAGS =
 # -fomit-frame-pointer breaks debugging and C++ exceptions
 CFLAGS_OPTIMIZE_V=-O4
 
-# This BSP does not support librdbg
-HAS_RDBG=no
-
 #  This section makes the target dependent options file.
 
 #  NDEBUG (C library)

make/custom/pc386.cfg

@@ -22,9 +22,6 @@ CPU_CFLAGS =
 # -fomit-frame-pointer breaks debugging and C++ exceptions
 CFLAGS_OPTIMIZE_V=-O4
 
-# Define this to yes if this target supports multiprocessor environments.
-HAS_MP=no
-
 #  This section makes the target dependent options file.
 
 #  NDEBUG (C library)

make/custom/portsw.cfg

@@ -45,9 +45,6 @@ CONFIG.$(TARGET_ARCH).CC	 = $(RTEMS_ROOT)/make/compilers/gcc-$(RTEMS_BSP).cfg
 #
 HAS_CPLUSPLUS=no
 
-# Define this to yes if this target supports multiprocessor environments.
-HAS_MP=no
-
 # This target does NOT support the TCP/IP stack so ignore requests
 # to enable it.
 HAS_NETWORKING=no

make/custom/ppcn_60x.cfg

@@ -74,9 +74,6 @@ endef
 #
 CPU_CFLAGS = -mcpu=603
 
-# Define this to yes if this target supports multiprocessor environments.
-HAS_MP=no
-
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
 # NOTE: some level of -O may be actually required by inline assembler

make/custom/psim.cfg

@@ -79,9 +79,6 @@ CPU_CFLAGS = -mcpu=603
 # NOTE: some level of -O may be actually required by inline assembler
 CFLAGS_OPTIMIZE_V=-O4 -fno-keep-inline-functions
 
-# Define this to yes if this target supports multiprocessor environments.
-HAS_MP=no
-
 # This target does not support the TCP/IP stack so ignore requests
 # to enable it.
 # HAS_NETWORKING=no

make/custom/ts_386ex.cfg

@@ -23,9 +23,6 @@ CPU_CFLAGS =-msoft-float -mno-fp-ret-in-387
 # -fomit-frame-pointer breaks debugging and C++ exceptions
 CFLAGS_OPTIMIZE_V=-O4
 
-# This BSP does not support librdbg
-HAS_RDBG=no
-
 #  This section makes the target dependent options file.
 
 #  NDEBUG (C library)

make/main.cfg

@@ -42,10 +42,7 @@ MAKEFILE=Makefile
 
 #
 # Target variant names
-# and rule to expand them into (for example): sun4 sun4-debug sun4-profile
-# Note compiler config may add to TARGET_VARIANTS
 #
-
 TARGET_VARIANTS = debug profile
 
 #

tools/build/configure

@@ -1378,7 +1378,6 @@ ac_given_INSTALL="$INSTALL"
 trap 'rm -fr `echo "Makefile
 install-if-change
 lock-directory
-rcs-clean
 unlock-directory
  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
@@ -1479,7 +1478,6 @@ cat >> $CONFIG_STATUS <<EOF
 CONFIG_FILES=\${CONFIG_FILES-"Makefile
 install-if-change
 lock-directory
-rcs-clean
 unlock-directory
 "}
 EOF

tools/update/acpolish

@@ -404,10 +404,17 @@ sub subst_line
     { # makefile variable addition
 # print STDERR "MACRO: <$1> += <$2>\n";
         my $p = "$1" ;
-        ${"var_$p+"}="$2" ; 
+	if ( not defined ${"var_$p+"} )
-        # place a marker
+        {
-        push @tbuf, "<22>5$p\n" ;
+          # place a marker
-        push @vars, "$p+" ;
+          push @tbuf, "<22>5$p\n" ;
+          push @vars, "$p+" ;
+        }
+	else
+        {
+          print STDERR "WARNING += $_" ;
+        }
+        ${"var_$p+"} .=" $2" ; 
     }
     elsif ( /^[\s]*(\@[^\s]+\@)$/o )
     { # autoconf variable