Patch rtems-rc-20000713-1-cvs.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

that is yet another multilib-related structual cleanup patch:

  Changes:
  * Make RTEMS_TEST_NO_PAUSE a tests/ subpackage specific option.
    - Remove RTEMS_TEST_NO_PAUSE from custom/*.cfg, targopts.h and
      cpuopts.h.
    - Add autoconf macros RTEMS_*_RTEMS_TEST_NO_PAUSE
      (aclocal/rtems-test-no-pause.m4).
    - Add RTEMS_*_RTEMS_TEST_NO_PAUSE support to sptests/configure.ins
      and tmtests/configure.in. These are the only subdirectories which
      currently apply RTEMS_TEST_NO_PAUSE.
    - Add autoconf-DEFS support to all test subpackages' configure.ins
      below tests/. I.e. AC_DEFINES now get explicitly propagated as
      preprocessor defines into Makefiles, cf. AM_CPPFLAGS in
      tests/*/*.am, instead of using a global config-files.
    - Remove NDEBUG from custom/*.cfg.

  * AC_DEFINE POSIX_API, ITRON_API and MULTIPROCESSING in
    exec/configure.in, only.
    - All other sources now should relay on the values from cpuopts.h
      and should not define them themselves.
    - Several related changes to many configure.ins

  * Bug-fixes to RTEMS_*_RTEMS_DEBUG macros (Actually workarounds to
    quoting bugs in autoconf).

  Notes:
    * This patch is rather immature and only tested for a small subset
      of BSPs (requires the tests to be enabled and therefore takes an
      tremendous amount of disc space and time.)
    * The patches to *cfg were generated by a script. Expect file
      formating changes :)

71 files changed, 83 insertions, 113 deletions

diff --git a/c/src/exec/configure.in b/c/src/exec/configure.in
index f648045d7f..b5c62b66c9 100644
--- a/c/src/exec/configure.in
+++ b/c/src/exec/configure.in
@@ -69,6 +69,10 @@ fi
 AC_CONFIG_SUBDIRS($cfg_subdirs)
 AC_CONFIG_SUBDIRS(score/cpu/$RTEMS_CPU)
 
+RTEMS_DEFINE_POSIX_API
+RTEMS_DEFINE_ITRON_API
+RTEMS_DEFINE_MULTIPROCESSING
+
 AM_CONFIG_HEADER(score/include/rtems/score/cpuopts-tmp.h)
 
 # Explicitly list all Makefiles here
diff --git a/c/src/exec/itron/configure.in b/c/src/exec/itron/configure.in
index e34148c2e7..8f789378e5 100644
--- a/c/src/exec/itron/configure.in
+++ b/c/src/exec/itron/configure.in
@@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-itron,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_ITRON
 RTEMS_ENABLE_INLINES
 
@@ -26,7 +25,6 @@ RTEMS_PROJECT_ROOT
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
 
-RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_ITRON_API(RTEMS_BSP)
 
 # If RTEMS macros are enabled, then use them.  Otherwise, use inlines.
diff --git a/c/src/exec/posix/configure.in b/c/src/exec/posix/configure.in
index dd1dc7b9b8..d68039679d 100644
--- a/c/src/exec/posix/configure.in
+++ b/c/src/exec/posix/configure.in
@@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-posix,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_POSIX
 RTEMS_ENABLE_INLINES
 
diff --git a/c/src/exec/score/cpu/unix/configure.in b/c/src/exec/score/cpu/unix/configure.in
index 76e25469e1..a877c061cf 100644
--- a/c/src/exec/score/cpu/unix/configure.in
+++ b/c/src/exec/score/cpu/unix/configure.in
@@ -12,8 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-exec-score-cpu-unix,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_MULTIPROCESSING
-
 RTEMS_ENV_RTEMSCPU
 
 RTEMS_CHECK_CPU
diff --git a/c/src/lib/configure.in b/c/src/lib/configure.in
index b86edceb3c..90e4c46d57 100644
--- a/c/src/lib/configure.in
+++ b/c/src/lib/configure.in
@@ -11,7 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_NETWORKING
 RTEMS_ENABLE_BARE
 
diff --git a/c/src/lib/libbsp/a29k/portsw/configure.in b/c/src/lib/libbsp/a29k/portsw/configure.in
index cf15f86827..099fca2f3b 100644
--- a/c/src/lib/libbsp/a29k/portsw/configure.in
+++ b/c/src/lib/libbsp/a29k/portsw/configure.in
@@ -13,7 +13,6 @@ AM_MAINTAINER_MODE
 
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
-RTEMS_ENABLE_MULTIPROCESSING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/configure.in b/c/src/lib/libbsp/configure.in
index f679af06a5..825ceab3ea 100644
--- a/c/src/lib/libbsp/configure.in
+++ b/c/src/lib/libbsp/configure.in
@@ -11,7 +11,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
 RTEMS_ENABLE_BARE
diff --git a/c/src/lib/libbsp/h8300/h8sim/configure.in b/c/src/lib/libbsp/h8300/h8sim/configure.in
index bebd61a5f6..5e06052dee 100644
--- a/c/src/lib/libbsp/h8300/h8sim/configure.in
+++ b/c/src/lib/libbsp/h8300/h8sim/configure.in
@@ -13,7 +13,6 @@ AM_MAINTAINER_MODE
 
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
-RTEMS_ENABLE_MULTIPROCESSING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/hppa1.1/simhppa/configure.in b/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
index 89137d7f38..ae75ab151e 100644
--- a/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
+++ b/c/src/lib/libbsp/hppa1.1/simhppa/configure.in
@@ -13,7 +13,6 @@ AM_MAINTAINER_MODE
 
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
-RTEMS_ENABLE_MULTIPROCESSING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/i960/cvme961/configure.in b/c/src/lib/libbsp/i960/cvme961/configure.in
index 0de4f5d17e..17140ab5a3 100644
--- a/c/src/lib/libbsp/i960/cvme961/configure.in
+++ b/c/src/lib/libbsp/i960/cvme961/configure.in
@@ -13,7 +13,6 @@ AM_MAINTAINER_MODE
 
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
-RTEMS_ENABLE_MULTIPROCESSING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/i960/i960sim/configure.in b/c/src/lib/libbsp/i960/i960sim/configure.in
index 050339cef4..c69064a6da 100644
--- a/c/src/lib/libbsp/i960/i960sim/configure.in
+++ b/c/src/lib/libbsp/i960/i960sim/configure.in
@@ -13,7 +13,6 @@ AM_MAINTAINER_MODE
 
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
-RTEMS_ENABLE_MULTIPROCESSING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/i960/rxgen960/configure.in b/c/src/lib/libbsp/i960/rxgen960/configure.in
index 133ca099fe..9fd93aa359 100644
--- a/c/src/lib/libbsp/i960/rxgen960/configure.in
+++ b/c/src/lib/libbsp/i960/rxgen960/configure.in
@@ -13,7 +13,6 @@ AM_MAINTAINER_MODE
 
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
-RTEMS_ENABLE_MULTIPROCESSING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/no_cpu/no_bsp/configure.in b/c/src/lib/libbsp/no_cpu/no_bsp/configure.in
index cbc96c8cdf..b0a7893e5a 100644
--- a/c/src/lib/libbsp/no_cpu/no_bsp/configure.in
+++ b/c/src/lib/libbsp/no_cpu/no_bsp/configure.in
@@ -13,7 +13,6 @@ AM_MAINTAINER_MODE
 
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
-RTEMS_ENABLE_MULTIPROCESSING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/powerpc/dmv177/configure.in b/c/src/lib/libbsp/powerpc/dmv177/configure.in
index dccadc4fee..4aacd1e5fa 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/configure.in
+++ b/c/src/lib/libbsp/powerpc/dmv177/configure.in
@@ -13,18 +13,15 @@ AM_MAINTAINER_MODE
 
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
-RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_NETWORKING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
-RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST
 
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
-AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
 
 RTEMS_PROJECT_ROOT
 
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/configure.in b/c/src/lib/libbsp/powerpc/eth_comm/configure.in
index 241c776c0c..774d9ee485 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/configure.in
+++ b/c/src/lib/libbsp/powerpc/eth_comm/configure.in
@@ -13,18 +13,15 @@ AM_MAINTAINER_MODE
 
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
-RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_NETWORKING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
-RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST
 
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
-AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
 
 RTEMS_PROJECT_ROOT
 
diff --git a/c/src/lib/libbsp/powerpc/helas403/configure.in b/c/src/lib/libbsp/powerpc/helas403/configure.in
index cfa62fec4b..c2684805c9 100644
--- a/c/src/lib/libbsp/powerpc/helas403/configure.in
+++ b/c/src/lib/libbsp/powerpc/helas403/configure.in
@@ -13,18 +13,15 @@ AM_MAINTAINER_MODE
 
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
-RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_NETWORKING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
-RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST
 
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
-AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
 
 RTEMS_PROJECT_ROOT
 
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/configure.in b/c/src/lib/libbsp/powerpc/mbx8xx/configure.in
index e87fa11590..f6923be4c4 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/configure.in
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/configure.in
@@ -12,19 +12,16 @@ AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-powerpc-mbx8xx,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
 RTEMS_ENABLE_LIBCDIR
-RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_NETWORKING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
-RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST
 
 RTEMS_PROJECT_ROOT
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
-AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
 
 # Explicitly list a Makefile here 
 AC_OUTPUT( 
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in
index bbfdf37013..cb18939cb4 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.in
@@ -13,18 +13,15 @@ AM_MAINTAINER_MODE
 
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
-RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_NETWORKING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
-RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST
 
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
-AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
 
 RTEMS_PROJECT_ROOT
 
diff --git a/c/src/lib/libbsp/powerpc/papyrus/configure.in b/c/src/lib/libbsp/powerpc/papyrus/configure.in
index 1c1d473a15..b1206aabfe 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/configure.in
+++ b/c/src/lib/libbsp/powerpc/papyrus/configure.in
@@ -13,18 +13,15 @@ AM_MAINTAINER_MODE
 
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
-RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_NETWORKING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
-RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
 RTEMS_CHECK_NETWORKING
 RTEMS_CANONICAL_HOST
 
 AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
-AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
 
 RTEMS_PROJECT_ROOT
 
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in
index ae966a2b54..0045872136 100644
--- a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in
+++ b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in
@@ -13,7 +13,6 @@ AM_MAINTAINER_MODE
 
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
-RTEMS_ENABLE_MULTIPROCESSING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/powerpc/psim/configure.in b/c/src/lib/libbsp/powerpc/psim/configure.in
index ec50803f96..9364127215 100644
--- a/c/src/lib/libbsp/powerpc/psim/configure.in
+++ b/c/src/lib/libbsp/powerpc/psim/configure.in
@@ -13,7 +13,6 @@ AM_MAINTAINER_MODE
 
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
-RTEMS_ENABLE_MULTIPROCESSING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
diff --git a/c/src/lib/libbsp/unix/posix/configure.in b/c/src/lib/libbsp/unix/posix/configure.in
index 7287f9ebe0..a63f020543 100644
--- a/c/src/lib/libbsp/unix/posix/configure.in
+++ b/c/src/lib/libbsp/unix/posix/configure.in
@@ -12,7 +12,6 @@ AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-unix-posix,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
 RTEMS_ENABLE_CXX
-RTEMS_ENABLE_MULTIPROCESSING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CANONICAL_HOST
diff --git a/c/src/libmisc/configure.in b/c/src/libmisc/configure.in
index ef027f5574..13c4a55369 100644
--- a/c/src/libmisc/configure.in
+++ b/c/src/libmisc/configure.in
@@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-libmisc,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_BARE
 
 RTEMS_ENV_RTEMSBSP
diff --git a/c/src/tests/configure.in b/c/src/tests/configure.in
index 2bbfb374f7..91592b16fe 100644
--- a/c/src/tests/configure.in
+++ b/c/src/tests/configure.in
@@ -12,11 +12,9 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-tests,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_POSIX
 RTEMS_ENABLE_ITRON
 RTEMS_ENABLE_NETWORKING
-RTEMS_ENABLE_INLINES
 RTEMS_ENABLE_CXX
 RTEMS_ENABLE_GCC28
 RTEMS_ENABLE_BARE
diff --git a/c/src/tests/itrontests/configure.in b/c/src/tests/itrontests/configure.in
index c71d91c847..657a02a828 100644
--- a/c/src/tests/itrontests/configure.in
+++ b/c/src/tests/itrontests/configure.in
@@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-tests-itrontests,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_INLINES
 RTEMS_ENABLE_GCC28
 RTEMS_ENABLE_BARE
 
diff --git a/c/src/tests/itrontests/itrontests.am b/c/src/tests/itrontests/itrontests.am
index 25e96d366b..74bb1078ef 100644
--- a/c/src/tests/itrontests/itrontests.am
+++ b/c/src/tests/itrontests/itrontests.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/tests:
diff --git a/c/src/tests/libtests/configure.in b/c/src/tests/libtests/configure.in
index a11a71c8b8..4b33a014fe 100644
--- a/c/src/tests/libtests/configure.in
+++ b/c/src/tests/libtests/configure.in
@@ -12,12 +12,12 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-tests-libtests,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_INLINES
 RTEMS_ENABLE_CXX
 RTEMS_ENABLE_GCC28
 RTEMS_ENABLE_BARE
 
 RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_RTEMS_TEST_NO_PAUSE
 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
 
diff --git a/c/src/tests/libtests/libtests.am b/c/src/tests/libtests/libtests.am
index 577bac9fd2..2030f68d6c 100644
--- a/c/src/tests/libtests/libtests.am
+++ b/c/src/tests/libtests/libtests.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/tests:
diff --git a/c/src/tests/mptests/configure.in b/c/src/tests/mptests/configure.in
index 73302b76c6..73b4ee45a2 100644
--- a/c/src/tests/mptests/configure.in
+++ b/c/src/tests/mptests/configure.in
@@ -12,10 +12,8 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-tests-mptests,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_INLINES
 RTEMS_ENABLE_GCC28
 RTEMS_ENABLE_BARE
-RTEMS_ENABLE_MULTIPROCESSING
 
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CPU
diff --git a/c/src/tests/mptests/mp01/node1/Makefile.am b/c/src/tests/mptests/mp01/node1/Makefile.am
index fcddeccc68..006791ee11 100644
--- a/c/src/tests/mptests/mp01/node1/Makefile.am
+++ b/c/src/tests/mptests/mp01/node1/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp01/node2/Makefile.am b/c/src/tests/mptests/mp01/node2/Makefile.am
index 23a4b86a14..0e0a342b2d 100644
--- a/c/src/tests/mptests/mp01/node2/Makefile.am
+++ b/c/src/tests/mptests/mp01/node2/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp02/node1/Makefile.am b/c/src/tests/mptests/mp02/node1/Makefile.am
index 0644447874..9349ba0029 100644
--- a/c/src/tests/mptests/mp02/node1/Makefile.am
+++ b/c/src/tests/mptests/mp02/node1/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp02/node2/Makefile.am b/c/src/tests/mptests/mp02/node2/Makefile.am
index 570db75ea2..9386b56482 100644
--- a/c/src/tests/mptests/mp02/node2/Makefile.am
+++ b/c/src/tests/mptests/mp02/node2/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp03/node1/Makefile.am b/c/src/tests/mptests/mp03/node1/Makefile.am
index 02ab109ef2..582fecb064 100644
--- a/c/src/tests/mptests/mp03/node1/Makefile.am
+++ b/c/src/tests/mptests/mp03/node1/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp03/node2/Makefile.am b/c/src/tests/mptests/mp03/node2/Makefile.am
index 9ec135eac0..4744e85e00 100644
--- a/c/src/tests/mptests/mp03/node2/Makefile.am
+++ b/c/src/tests/mptests/mp03/node2/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp04/node1/Makefile.am b/c/src/tests/mptests/mp04/node1/Makefile.am
index f1c48a32dd..e651e12c85 100644
--- a/c/src/tests/mptests/mp04/node1/Makefile.am
+++ b/c/src/tests/mptests/mp04/node1/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp04/node2/Makefile.am b/c/src/tests/mptests/mp04/node2/Makefile.am
index 601919f21f..1e96e00a47 100644
--- a/c/src/tests/mptests/mp04/node2/Makefile.am
+++ b/c/src/tests/mptests/mp04/node2/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp05/node1/Makefile.am b/c/src/tests/mptests/mp05/node1/Makefile.am
index a53e9b2c06..8b3d4c7982 100644
--- a/c/src/tests/mptests/mp05/node1/Makefile.am
+++ b/c/src/tests/mptests/mp05/node1/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp05/node2/Makefile.am b/c/src/tests/mptests/mp05/node2/Makefile.am
index b27b2b81db..2f36e9793f 100644
--- a/c/src/tests/mptests/mp05/node2/Makefile.am
+++ b/c/src/tests/mptests/mp05/node2/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp06/node1/Makefile.am b/c/src/tests/mptests/mp06/node1/Makefile.am
index c0394c36ca..8046e76329 100644
--- a/c/src/tests/mptests/mp06/node1/Makefile.am
+++ b/c/src/tests/mptests/mp06/node1/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp06/node2/Makefile.am b/c/src/tests/mptests/mp06/node2/Makefile.am
index dc2c865598..c97464e677 100644
--- a/c/src/tests/mptests/mp06/node2/Makefile.am
+++ b/c/src/tests/mptests/mp06/node2/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp07/node1/Makefile.am b/c/src/tests/mptests/mp07/node1/Makefile.am
index fd03da42a8..2cf3d2c56d 100644
--- a/c/src/tests/mptests/mp07/node1/Makefile.am
+++ b/c/src/tests/mptests/mp07/node1/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp07/node2/Makefile.am b/c/src/tests/mptests/mp07/node2/Makefile.am
index c6d4173459..2620068f27 100644
--- a/c/src/tests/mptests/mp07/node2/Makefile.am
+++ b/c/src/tests/mptests/mp07/node2/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp08/node1/Makefile.am b/c/src/tests/mptests/mp08/node1/Makefile.am
index 34331f026e..02bc0fa4dc 100644
--- a/c/src/tests/mptests/mp08/node1/Makefile.am
+++ b/c/src/tests/mptests/mp08/node1/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp08/node2/Makefile.am b/c/src/tests/mptests/mp08/node2/Makefile.am
index dea01f6853..44cce51174 100644
--- a/c/src/tests/mptests/mp08/node2/Makefile.am
+++ b/c/src/tests/mptests/mp08/node2/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp09/node1/Makefile.am b/c/src/tests/mptests/mp09/node1/Makefile.am
index aaea270e37..d2e175f363 100644
--- a/c/src/tests/mptests/mp09/node1/Makefile.am
+++ b/c/src/tests/mptests/mp09/node1/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp09/node2/Makefile.am b/c/src/tests/mptests/mp09/node2/Makefile.am
index c9eccac036..8b4c36d222 100644
--- a/c/src/tests/mptests/mp09/node2/Makefile.am
+++ b/c/src/tests/mptests/mp09/node2/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp10/node1/Makefile.am b/c/src/tests/mptests/mp10/node1/Makefile.am
index 7281b77bcf..c74d08bdc8 100644
--- a/c/src/tests/mptests/mp10/node1/Makefile.am
+++ b/c/src/tests/mptests/mp10/node1/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp10/node2/Makefile.am b/c/src/tests/mptests/mp10/node2/Makefile.am
index 8750e465dc..f9202bbefa 100644
--- a/c/src/tests/mptests/mp10/node2/Makefile.am
+++ b/c/src/tests/mptests/mp10/node2/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp11/node1/Makefile.am b/c/src/tests/mptests/mp11/node1/Makefile.am
index f86c54c1b7..83c85c864a 100644
--- a/c/src/tests/mptests/mp11/node1/Makefile.am
+++ b/c/src/tests/mptests/mp11/node1/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp11/node2/Makefile.am b/c/src/tests/mptests/mp11/node2/Makefile.am
index 35f2608e54..01e208778e 100644
--- a/c/src/tests/mptests/mp11/node2/Makefile.am
+++ b/c/src/tests/mptests/mp11/node2/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp12/node1/Makefile.am b/c/src/tests/mptests/mp12/node1/Makefile.am
index 9e3e61c6a4..c908401e87 100644
--- a/c/src/tests/mptests/mp12/node1/Makefile.am
+++ b/c/src/tests/mptests/mp12/node1/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp12/node2/Makefile.am b/c/src/tests/mptests/mp12/node2/Makefile.am
index e860040919..d75f710f4e 100644
--- a/c/src/tests/mptests/mp12/node2/Makefile.am
+++ b/c/src/tests/mptests/mp12/node2/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp13/node1/Makefile.am b/c/src/tests/mptests/mp13/node1/Makefile.am
index cfd2fa1a46..a85de6898c 100644
--- a/c/src/tests/mptests/mp13/node1/Makefile.am
+++ b/c/src/tests/mptests/mp13/node1/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp13/node2/Makefile.am b/c/src/tests/mptests/mp13/node2/Makefile.am
index 5be99378aa..0d09a9c642 100644
--- a/c/src/tests/mptests/mp13/node2/Makefile.am
+++ b/c/src/tests/mptests/mp13/node2/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp14/node1/Makefile.am b/c/src/tests/mptests/mp14/node1/Makefile.am
index e03c43c6ae..a8fa8f2da7 100644
--- a/c/src/tests/mptests/mp14/node1/Makefile.am
+++ b/c/src/tests/mptests/mp14/node1/Makefile.am
@@ -30,14 +30,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mp14/node2/Makefile.am b/c/src/tests/mptests/mp14/node2/Makefile.am
index 6b394e10d0..2381489d1c 100644
--- a/c/src/tests/mptests/mp14/node2/Makefile.am
+++ b/c/src/tests/mptests/mp14/node2/Makefile.am
@@ -30,14 +30,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/mptests.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I$(srcdir)/..
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/mptests/mptests.am b/c/src/tests/mptests/mptests.am
index 815ef8e00d..f7def3bbe0 100644
--- a/c/src/tests/mptests/mptests.am
+++ b/c/src/tests/mptests/mptests.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/tests:
diff --git a/c/src/tests/psxtests/configure.in b/c/src/tests/psxtests/configure.in
index 460f7c9d23..8a28b4025d 100644
--- a/c/src/tests/psxtests/configure.in
+++ b/c/src/tests/psxtests/configure.in
@@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-tests-psxtests,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_INLINES
 RTEMS_ENABLE_GCC28
 RTEMS_ENABLE_BARE
 
diff --git a/c/src/tests/psxtests/psxtests.am b/c/src/tests/psxtests/psxtests.am
index 15a8e28c9b..dc03d45b16 100644
--- a/c/src/tests/psxtests/psxtests.am
+++ b/c/src/tests/psxtests/psxtests.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/tests:
diff --git a/c/src/tests/samples/base_mp/node1/Makefile.am b/c/src/tests/samples/base_mp/node1/Makefile.am
index fdf0db6e15..3a5a45e9e2 100644
--- a/c/src/tests/samples/base_mp/node1/Makefile.am
+++ b/c/src/tests/samples/base_mp/node1/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/sample.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/samples/base_mp/node2/Makefile.am b/c/src/tests/samples/base_mp/node2/Makefile.am
index acfe772653..0810138fb8 100644
--- a/c/src/tests/samples/base_mp/node2/Makefile.am
+++ b/c/src/tests/samples/base_mp/node2/Makefile.am
@@ -29,14 +29,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/sample.am
 
+AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
+
 if HAS_MP
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
-
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/c/src/tests/samples/configure.in b/c/src/tests/samples/configure.in
index ddb2c519c5..7f275e8d68 100644
--- a/c/src/tests/samples/configure.in
+++ b/c/src/tests/samples/configure.in
@@ -12,11 +12,7 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-tests-samples,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_MULTIPROCESSING
-RTEMS_ENABLE_POSIX
-RTEMS_ENABLE_ITRON
 RTEMS_ENABLE_NETWORKING
-RTEMS_ENABLE_INLINES
 RTEMS_ENABLE_CXX
 RTEMS_ENABLE_GCC28
 RTEMS_ENABLE_BARE
@@ -37,7 +33,6 @@ RTEMS_CANONICALIZE_TOOLS
 
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
-RTEMS_CHECK_POSIX_API(RTEMS_BSP)
 RTEMS_CHECK_CXX(RTEMS_BSP)
 
 AM_CONDITIONAL(HAS_CXX,test "$HAS_CPLUSPLUS" = "yes")
diff --git a/c/src/tests/samples/sample.am b/c/src/tests/samples/sample.am
index a294dcc949..dbd1482b9d 100644
--- a/c/src/tests/samples/sample.am
+++ b/c/src/tests/samples/sample.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/samples:
diff --git a/c/src/tests/sptests/configure.in b/c/src/tests/sptests/configure.in
index 0225a1fab1..7d5d9f9a33 100644
--- a/c/src/tests/sptests/configure.in
+++ b/c/src/tests/sptests/configure.in
@@ -12,11 +12,11 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-tests-sptests,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_INLINES
 RTEMS_ENABLE_GCC28
 RTEMS_ENABLE_BARE
 
 RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_RTEMS_TEST_NO_PAUSE
 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
 
diff --git a/c/src/tests/sptests/sptests.am b/c/src/tests/sptests/sptests.am
index 0ef24f02dc..57a81ea7a0 100644
--- a/c/src/tests/sptests/sptests.am
+++ b/c/src/tests/sptests/sptests.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/tests:
diff --git a/c/src/tests/support/configure.in b/c/src/tests/support/configure.in
index c5314c7027..bf2c4f3e06 100644
--- a/c/src/tests/support/configure.in
+++ b/c/src/tests/support/configure.in
@@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-tests-support,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_POSIX
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
@@ -24,7 +23,6 @@ RTEMS_CANONICALIZE_TOOLS
 
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
 RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP)
-RTEMS_CHECK_POSIX_API(RTEMS_BSP)
 
 AC_SUBST(BARE_CPU_CFLAGS)
 AC_SUBST(BARE_CPU_MODEL)
diff --git a/c/src/tests/tmitrontests/configure.in b/c/src/tests/tmitrontests/configure.in
index 01c59e3781..398ac955aa 100644
--- a/c/src/tests/tmitrontests/configure.in
+++ b/c/src/tests/tmitrontests/configure.in
@@ -12,7 +12,6 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-tests-tmitrontests,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_INLINES
 RTEMS_ENABLE_GCC28
 RTEMS_ENABLE_BARE
 
diff --git a/c/src/tests/tmitrontests/tmitrontests.am b/c/src/tests/tmitrontests/tmitrontests.am
index 577bac9fd2..2030f68d6c 100644
--- a/c/src/tests/tmitrontests/tmitrontests.am
+++ b/c/src/tests/tmitrontests/tmitrontests.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/tests:
diff --git a/c/src/tests/tmtests/configure.in b/c/src/tests/tmtests/configure.in
index 7c1061ad92..380a322d89 100644
--- a/c/src/tests/tmtests/configure.in
+++ b/c/src/tests/tmtests/configure.in
@@ -12,11 +12,11 @@ RTEMS_CANONICAL_TARGET_CPU
 AM_INIT_AUTOMAKE(rtems-c-src-tests-tmtests,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
 
-RTEMS_ENABLE_INLINES
 RTEMS_ENABLE_GCC28
 RTEMS_ENABLE_BARE
 
 RTEMS_ENV_RTEMSBSP
+RTEMS_CHECK_RTEMS_TEST_NO_PAUSE
 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
 
diff --git a/c/src/tests/tmtests/tmtests.am b/c/src/tests/tmtests/tmtests.am
index 577bac9fd2..2030f68d6c 100644
--- a/c/src/tests/tmtests/tmtests.am
+++ b/c/src/tests/tmtests/tmtests.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/tests: