1 files changed, 43 insertions, 13 deletions
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
 )
+