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 :)
2000-07-13 15:05:38 +00:00
parent ce39123263
commit b8a30d07a5
159 changed files with 191 additions and 402 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,8 @@ ACLOCAL_FILES += aclocal/ar-s.m4 aclocal/bsp-alias.m4 \
    aclocal/i386-gas-code16.m4 aclocal/path-ksh.m4 aclocal/path-perl.m4 \
    aclocal/prog-cc.m4 aclocal/prog-cxx.m4 aclocal/project-root.m4 \
    aclocal/rtems-top.m4 aclocal/sysv-ipc.m4 aclocal/target.m4 \
-    aclocal/tool-paths.m4 aclocal/tool-prefix.m4 aclocal/multilib.m4
+    aclocal/tool-paths.m4 aclocal/tool-prefix.m4 aclocal/multilib.m4 \
+    aclocal/rtems-debug.m4 aclocal/rtems-test-no-pause.m4

 noinst_SCRIPTS = bootstrap

--- a/aclocal/check-itron.m4
+++ b/aclocal/check-itron.m4
@@ -26,7 +26,10 @@ else
  HAS_ITRON_API="no";
 fi
 AC_SUBST(HAS_ITRON_API)dnl
+])

+AC_DEFUN(RTEMS_DEFINE_ITRON_API,
+[AC_REQUIRE([RTEMS_CHECK_ITRON_API])dnl
 if test x"${HAS_ITRON_API}" = x"yes";
 then
  AC_DEFINE_UNQUOTED(RTEMS_ITRON_API,1,[if itron api is supported])
--- a/aclocal/check-multiprocessing.m4
+++ b/aclocal/check-multiprocessing.m4
@@ -35,10 +35,12 @@ else
 HAS_MP="no"
 fi
 AC_SUBST(HAS_MP)
+])

+AC_DEFUN(RTEMS_DEFINE_MULTIPROCESSING,
+[AC_REQUIRE([RTEMS_CHECK_MULTIPROCESSING])dnl
 if test x"${HAS_MP}" = x"yes";
 then
  AC_DEFINE_UNQUOTED(RTEMS_MULTIPROCESSING,1,[if multiprocessing is supported])
 fi
-
 ])
--- a/aclocal/check-posix.m4
+++ b/aclocal/check-posix.m4
@@ -26,7 +26,10 @@ else
  HAS_POSIX_API="no";
 fi
 AC_SUBST(HAS_POSIX_API)dnl
+])

+AC_DEFUN(RTEMS_DEFINE_POSIX_API,
+[AC_REQUIRE([RTEMS_CHECK_POSIX_API])dnl
 if test x"${HAS_POSIX_API}" = x"yes";
 then
  AC_DEFINE_UNQUOTED(RTEMS_POSIX_API,1,[if posix api is supported])
--- a/aclocal/rtems-debug.m4
+++ b/aclocal/rtems-debug.m4
@@ -1,3 +1,5 @@
+## $Id$
+
 AC_DEFUN(RTEMS_ENABLE_RTEMS_DEBUG,
 [
 AC_ARG_ENABLE(rtems-debug,
@@ -10,7 +12,7 @@ esac],[RTEMS_DEBUG=no])
 ])

 AC_DEFUN(RTEMS_CHECK_RTEMS_DEBUG,
-[AC_REQUIRE(RTEMS_ENABLE_RTEMS_DEBUG)
+[AC_REQUIRE([RTEMS_ENABLE_RTEMS_DEBUG])
 if test x"${RTEMS_DEBUG}" = x"yes";
 then
  AC_DEFINE_UNQUOTED(RTEMS_DEBUG,1,[if RTEMS_DEBUG is enabled])
--- a/aclocal/rtems-test-no-pause.m4
+++ b/aclocal/rtems-test-no-pause.m4
@@ -0,0 +1,18 @@
+AC_DEFUN(RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE,
+[AC_ARG_ENABLE(test-no-pause,
+[  --disable-test-no-pause              disable RTEMS_TEST_NO_PAUSE],
+[case "${enableval}" in
+  yes) RTEMS_TEST_NO_PAUSE=yes ;;
+  no) RTEMS_TEST_NO_PAUSE=no ;;
+  *) AC_MSG_ERROR([bad value ${enableval} for RTEMS_TEST_NO_PAUSE]) ;;
+esac],[RTEMS_TEST_NO_PAUSE=no])
+])
+
+AC_DEFUN(RTEMS_CHECK_RTEMS_TEST_NO_PAUSE,
+[AC_REQUIRE([RTEMS_ENABLE_RTEMS_TEST_NO_PAUSE])
+if test x"${RTEMS_TEST_NO_PAUSE}" = x"yes";
+then
+  AC_DEFINE_UNQUOTED(RTEMS_TEST_NO_PAUSE,1,[if RTEMS_TEST_NO_PAUSE is enabled])
+fi
+])
+
--- 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
--- 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.
--- 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

--- 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
--- 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

--- 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)
--- 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
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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

--- 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

--- 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

--- 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( 
--- 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

--- 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

--- 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)
--- 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)
--- 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
--- 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
--- 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
--- 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

--- 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:
--- 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

--- 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:
--- 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
--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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)

--- 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:
--- 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

--- 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:
--- 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)

--- 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)

--- 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")
--- 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:
--- 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

--- 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:
--- 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)
--- 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

--- 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:
--- 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

--- 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:
--- a/make/custom/Cygwin-posix.cfg
+++ b/make/custom/Cygwin-posix.cfg
@@ -31,14 +31,10 @@ CFLAGS_OPTIMIZE_V = -O2

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
 #  RTEMS_UNIX (unix)
 #     Define this to indicate this is an RTEMS UNIX port.

 define make-target-options
-	echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 	echo "#define RTEMS_UNIX 1 "                       >>$@
 endef

@@ -48,6 +44,5 @@ define make-exe
 	$(SIZE) $@
 endef

-
 # *****************************************************************
 # Miscellaneous additions go here
--- a/make/custom/FreeBSD-posix.cfg
+++ b/make/custom/FreeBSD-posix.cfg
@@ -1,7 +1,5 @@
 #
 #  Config file for the FreeBSD 2.x based RTEMS UNIX 
-#
-#

 RTEMS_CPU=unix
 RTEMS_CPU_FAMILY=i386
@@ -22,21 +20,16 @@ LIBC_DEFINES+=-DRTEMS_UNIXLIB -DRTEMS_UNIX -DMALLOC_PROVIDED
 LIBC_DEFINES += -DWORKSPACE_MB=2
 LIBC_DEFINES += -DHEAPSPACE_MB=1

-
 # optimize flag: typically -0, could use -O4 or -fast
 # -O4 is ok for RTEMS
 CFLAGS_OPTIMIZE_V = -O2

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
 #  RTEMS_UNIX (unix)
 #     Define this to indicate this is an RTEMS UNIX port.

 define make-target-options
-	echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 	echo "#define RTEMS_UNIX 1 "                       >>$@
 endef

@@ -46,6 +39,5 @@ define make-exe
 	$(SIZE) $@
 endef

-
 # *****************************************************************
 # Miscellaneous additions go here
--- a/make/custom/HPUX9-posix.cfg
+++ b/make/custom/HPUX9-posix.cfg
@@ -35,14 +35,10 @@ CFLAGS_OPTIMIZE_V = -O2

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
 #  RTEMS_UNIX (unix)
 #     Define this to indicate this is an RTEMS UNIX port.

 define make-target-options
-	echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 	echo "#define RTEMS_UNIX 1 "                       >>$@
 endef

--- a/make/custom/Linux-posix.cfg
+++ b/make/custom/Linux-posix.cfg
@@ -31,14 +31,10 @@ CFLAGS_OPTIMIZE_V = -O2

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
 #  RTEMS_UNIX (unix)
 #     Define this to indicate this is an RTEMS UNIX port.

 define make-target-options
-	echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 	echo "#define RTEMS_UNIX 1 "                       >>$@
 endef

@@ -48,6 +44,5 @@ define make-exe
 	$(SIZE) $@
 endef

-
 # *****************************************************************
 # Miscellaneous additions go here
--- a/make/custom/Solaris-posix.cfg
+++ b/make/custom/Solaris-posix.cfg
@@ -28,14 +28,10 @@ CFLAGS_OPTIMIZE_V = -O2

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
 #  RTEMS_UNIX (unix)
 #     Define this to indicate this is an RTEMS UNIX port.

 define make-target-options
-	echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 	echo "#define RTEMS_UNIX 1 "                       >>$@
 endef

@@ -47,5 +43,4 @@ endef

 # *****************************************************************

-
 # Miscellaneous additions go here
--- a/make/custom/bare.cfg
+++ b/make/custom/bare.cfg
@@ -21,12 +21,7 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
-
 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 endef

 # this target has no start file
--- a/make/custom/cvme961.cfg
+++ b/make/custom/cvme961.cfg
@@ -27,12 +27,7 @@ CFLAGS_OPTIMIZE_V=-O4 -mleaf-procedures

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
-
 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 endef

 # The following are definitions of make-exe which will work using ld as
--- a/make/custom/dmv152.cfg
+++ b/make/custom/dmv152.cfg
@@ -28,17 +28,12 @@ BSP_CPPFLAGS = -DUSE_CHANNEL_A
 CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer

 #  This section makes the target dependent options file.
-
-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
 #  USE_CHANNEL_A (DMV152)
 #  USE_CHANNEL_B (DMV152)
 #     One and only one of these should be set to 1 to indicate which
 #     serial port is used as the RTEMS console.

 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 #	@echo "#define USE_CHANNEL_A  1"                    >>$@
 #	@echo "#define USE_CHANNEL_B  0"                    >>$@
 endef
--- a/make/custom/dmv177.cfg
+++ b/make/custom/dmv177.cfg
@@ -18,9 +18,6 @@ RTEMS_BSP_FAMILY=dmv177

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
 #  CONSOLE_USE_POLLED     (psim_bsp)
 #  CONSOLE_USE_INTERRUPTS (psim_bsp)
 #     The psim console driver has the structure to operate in either
@@ -52,7 +49,6 @@ RTEMS_BSP_FAMILY=dmv177
 #     The BSP actually contains the call that enables this.

 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"                      >>$@
 	@echo "#define CONSOLE_USE_INTERRUPTS 0"                   >>$@
 	@echo "#define CONSOLE_USE_POLLED !CONSOLE_USE_INTERRUPTS" >>$@
 	@echo "#define PPC_VECTOR_FILE_BASE 0x0100"                >>$@
--- a/make/custom/efi332.cfg
+++ b/make/custom/efi332.cfg
@@ -21,12 +21,7 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
-
 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 endef

 # The following are definitions of make-exe which will work using ld as
@@ -55,5 +50,4 @@ define make-exe
 endef
 endif

-
 # Miscellaneous additions go here
--- a/make/custom/efi68k.cfg
+++ b/make/custom/efi68k.cfg
@@ -25,12 +25,7 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
-
 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 endef

 # The following are definitions of make-exe which will work using ld as
--- a/make/custom/erc32.cfg
+++ b/make/custom/erc32.cfg
@@ -30,9 +30,6 @@ CFLAGS_OPTIMIZE_V=-O4

 #  This makes the target dependent options file

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
 #  NO_TABLE_MOVE (SPARC PORT)
 #     do not have a second trap table -- use the BSP's
 #
@@ -55,7 +52,6 @@ CFLAGS_OPTIMIZE_V=-O4
 #

 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"                      >>$@
 	@echo "#define NO_TABLE_MOVE 1"                            >>$@
 	@echo "#define CONSOLE_USE_INTERRUPTS 0"                   >>$@
 	@echo "#define CONSOLE_USE_POLLED !CONSOLE_USE_INTERRUPTS" >>$@
@@ -63,8 +59,6 @@ define make-target-options
 	@echo "#define FPU_REVB 1"                                 >>$@
 endef

-
-
 # The following are definitions of make-exe which will work using ld as
 # is currently required.  It is expected that as of gcc 2.8, the end user
 # will be able to override parts of the compilers specs and link using gcc.
--- a/make/custom/eth_comm.cfg
+++ b/make/custom/eth_comm.cfg
@@ -17,9 +17,6 @@ CPU_DEFINES=

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#       
 #  PPC_VECTOR_FILE_BASE (PowerPC)
 #     This defines the base address of the exception table.
 #     NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100
@@ -45,7 +42,6 @@ define make-target-options
 	@echo "#endif"                                      >>$@
 	@echo "#define mpc$(CPU_TYPE) 1"                    >>$@
 	@echo                                               >>$@
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 	@echo "#define PPC_VECTOR_FILE_BASE 0x0000"         >>$@
 	@echo "#define PPC_ABI PPC_ABI_EABI"                >>$@
 	@echo "#define PPC_ASM PPC_ASM_ELF"                 >>$@
@@ -88,4 +84,3 @@ endif

 # Miscellaneous additions go here

-
--- a/make/custom/gen68302.cfg
+++ b/make/custom/gen68302.cfg
@@ -26,12 +26,7 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
-
 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 endef

 # The following are definitions of make-exe which will work using ld as
--- a/make/custom/gen68340.cfg
+++ b/make/custom/gen68340.cfg
@@ -20,12 +20,8 @@ CPU_CFLAGS = -mcpu32
 CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer

 #  This section makes the target dependent options file.
-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#

 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 endef

 # The following are definitions of make-exe which will work using ld as
@@ -71,5 +67,4 @@ endef
 #	       $(basename $@).exe $(basename $@).ieee
 endif

-
 # Miscellaneous additions go here
--- a/make/custom/gen68360.cfg
+++ b/make/custom/gen68360.cfg
@@ -32,17 +32,11 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-pointer

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
-
 ifeq ($(RTEMS_GEN68360_COMPANION_MODE),yes)
 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 endef
 else
 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 	@echo "#define RTEMS__mcpu32p__ 1"                  >>$@
 endef
 endif
@@ -76,5 +70,4 @@ define make-exe
 endef
 endif

-
 # Miscellaneous additions go here
--- a/make/custom/gensh1.cfg
+++ b/make/custom/gensh1.cfg
@@ -38,15 +38,9 @@ CFLAGS_OPTIMIZE_V = -O4

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
-
 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 endef

-
 # The following are definitions of make-exe which will work using ld as
 # is currently required.  It is expected that as of gcc 2.8, the end user
 # will be able to override parts of the compilers specs and link using gcc.
--- a/make/custom/gensh2.cfg
+++ b/make/custom/gensh2.cfg
@@ -41,9 +41,6 @@ CFLAGS_OPTIMIZE_V = -O4

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
 #  STANDALONE_EVB
 #     This switch compiles code to jump-start from FLASH, without a monitor
 #
@@ -53,13 +50,11 @@ CFLAGS_OPTIMIZE_V = -O4
 #

 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 	@echo "#define RTEMS_TEST_IO_STREAM 1"              >>$@
 	@echo "/* #define STANDALONE_EVB 1 */"              >>$@
 	@echo "#define START_HW_INIT 1"                     >>$@
 endef

-
 # The following are definitions of make-exe which will work using ld as
 # is currently required.  It is expected that as of gcc 2.8, the end user
 # will be able to override parts of the compilers specs and link using gcc.
--- a/make/custom/h8sim.cfg
+++ b/make/custom/h8sim.cfg
@@ -24,12 +24,7 @@ CFLAGS_OPTIMIZE_V=-O0 -g

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
-
 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 endef

 # The following are definitions of make-exe which will work using ld as
--- a/make/custom/helas403.cfg
+++ b/make/custom/helas403.cfg
@@ -20,9 +20,6 @@ RTEMS_BSP_FAMILY=helas403

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
 #  PPC_VECTOR_FILE_BASE (PowerPC)
 #     This defines the base address of the exception table.
 #     NOTE: Vectors are actually at 0xFFF00000 but file starts at offset 0x0100
@@ -34,7 +31,6 @@ RTEMS_BSP_FAMILY=helas403
 #     other tools like debuggers.

 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 	@echo "#define PPC_VECTOR_FILE_BASE 0x0100"         >>$@
 	@echo "#define PPC_USE_SPRG 1"                      >>$@
 endef
@@ -78,4 +74,3 @@ endif

 # Miscellaneous additions go here

-
--- a/make/custom/i386ex.cfg
+++ b/make/custom/i386ex.cfg
@@ -24,12 +24,7 @@ CFLAGS_OPTIMIZE_V=-O4

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
-
 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 endef

 #  Something like this should produce a map file but this does not work.
--- a/make/custom/i960sim.cfg
+++ b/make/custom/i960sim.cfg
@@ -24,12 +24,7 @@ CFLAGS_OPTIMIZE_V=-O0 -g

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
-
 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 endef

 # The following are definitions of make-exe which will work using ld as
--- a/make/custom/idp.cfg
+++ b/make/custom/idp.cfg
@@ -14,12 +14,7 @@ RTEMS_BSP_FAMILY=idp

 #  This section makes the target dependent options file.

-#  RTEMS_TEST_NO_PAUSE (RTEMS tests)
-#     do not pause between screens of output in the rtems tests
-#
-
 define make-target-options
-	@echo "#define RTEMS_TEST_NO_PAUSE 1"               >>$@
 endef

 #  This contains the compiler options necessary to select the CPU model
--- a/Show More
+++ b/Show More