14 files changed, 264 insertions, 177 deletions
diff --git a/c/src/exec/aclocal.m4 b/c/src/exec/aclocal.m4
index 6e159606e2..35722142d8 100644
--- a/c/src/exec/aclocal.m4
+++ b/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
+])
+
+
diff --git a/c/src/exec/configure b/c/src/exec/configure
index b116a5d6a1..3e230e7b00 100644
--- a/c/src/exec/configure
+++ b/c/src/exec/configure
@@ -2672,40 +2672,46 @@ RTEMS_USE_NEWLIB="$rtems_cv_use_newlib"
 
 
 
-# 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
+# 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 "$ac_t""no" 1>&6
+  { 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_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
+echo "$ac_t""$rtems_cv_HAS_MP" 1>&6
+if test "$rtems_cv_HAS_MP" = "yes"; then
+HAS_MP="yes"
 else
-  echo "$ac_t""no" 1>&6
+HAS_MP="no"
 fi
 
 
 
+# find all the Executive Makefiles
+
 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
 
+
diff --git a/c/src/exec/configure.in b/c/src/exec/configure.in
index c9ac55045a..8b8f5d23b3 100644
--- a/c/src/exec/configure.in
+++ b/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
 )
+
diff --git a/c/src/exec/posix/include/rtems/posix/Makefile.in b/c/src/exec/posix/include/rtems/posix/Makefile.in
index 66e0bcbc34..e360288f06 100644
--- a/c/src/exec/posix/include/rtems/posix/Makefile.in
+++ b/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
diff --git a/c/src/exec/rtems/Makefile.in b/c/src/exec/rtems/Makefile.in
index 247f87d059..7c453f8def 100644
--- a/c/src/exec/rtems/Makefile.in
+++ b/c/src/exec/rtems/Makefile.in
@@ -26,8 +26,7 @@ $(INSTALLDIRS):
 
 SUB_DIRS = include $(INLINE) optman src
 
-preinstall: 
-	$(mkinstalldirs) $(INSTALLDIRS)
+preinstall: $(INSTALLDIRS) 
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/exec/rtems/include/rtems/rtems/Makefile.in b/c/src/exec/rtems/include/rtems/rtems/Makefile.in
index d33d741095..d0c2258f6a 100644
--- a/c/src/exec/rtems/include/rtems/rtems/Makefile.in
+++ b/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
diff --git a/c/src/exec/rtems/src/Makefile.in b/c/src/exec/rtems/src/Makefile.in
index c0698129f9..ddb87ed80c 100644
--- a/c/src/exec/rtems/src/Makefile.in
+++ b/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 +=
 #
diff --git a/c/src/exec/sapi/include/rtems/Makefile.in b/c/src/exec/sapi/include/rtems/Makefile.in
index affb749384..304135a285 100644
--- a/c/src/exec/sapi/include/rtems/Makefile.in
+++ b/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) \
diff --git a/c/src/exec/score/Makefile.in b/c/src/exec/score/Makefile.in
index 390a141437..9c43167f35 100644
--- a/c/src/exec/score/Makefile.in
+++ b/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) \
diff --git a/c/src/exec/score/include/rtems/score/Makefile.in b/c/src/exec/score/include/rtems/score/Makefile.in
index c8c24d01da..d0c6b21300 100644
--- a/c/src/exec/score/include/rtems/score/Makefile.in
+++ b/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@
 
 #
diff --git a/c/src/exec/score/inline/rtems/score/Makefile.in b/c/src/exec/score/inline/rtems/score/Makefile.in
index 20dd5ad966..1321b144a2 100644
--- a/c/src/exec/score/inline/rtems/score/Makefile.in
+++ b/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
diff --git a/c/src/exec/score/macros/rtems/score/Makefile.in b/c/src/exec/score/macros/rtems/score/Makefile.in
index 933374d854..aa85874d34 100644
--- a/c/src/exec/score/macros/rtems/score/Makefile.in
+++ b/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
diff --git a/c/src/exec/score/src/Makefile.in b/c/src/exec/score/src/Makefile.in
index b4967b432d..f4cbf9d352 100644
--- a/c/src/exec/score/src/Makefile.in
+++ b/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 +=
 #
diff --git a/c/src/exec/wrapup/posix/Makefile.in b/c/src/exec/wrapup/posix/Makefile.in
index a795c9c3ad..efb86808fe 100644
--- a/c/src/exec/wrapup/posix/Makefile.in
+++ b/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) \