From b8a30d07a5a149eab8217c57c2fdf387efdf27f1 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 13 Jul 2000 15:05:38 +0000
Subject: 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 :)
---
 testsuites/itrontests/itrontests.am          | 2 ++
 testsuites/libtests/libtests.am              | 2 ++
 testsuites/mptests/mp01/node1/Makefile.am    | 4 ++--
 testsuites/mptests/mp01/node2/Makefile.am    | 4 ++--
 testsuites/mptests/mp02/node1/Makefile.am    | 4 ++--
 testsuites/mptests/mp02/node2/Makefile.am    | 4 ++--
 testsuites/mptests/mp03/node1/Makefile.am    | 4 ++--
 testsuites/mptests/mp03/node2/Makefile.am    | 4 ++--
 testsuites/mptests/mp04/node1/Makefile.am    | 4 ++--
 testsuites/mptests/mp04/node2/Makefile.am    | 4 ++--
 testsuites/mptests/mp05/node1/Makefile.am    | 4 ++--
 testsuites/mptests/mp05/node2/Makefile.am    | 4 ++--
 testsuites/mptests/mp06/node1/Makefile.am    | 4 ++--
 testsuites/mptests/mp06/node2/Makefile.am    | 4 ++--
 testsuites/mptests/mp07/node1/Makefile.am    | 4 ++--
 testsuites/mptests/mp07/node2/Makefile.am    | 4 ++--
 testsuites/mptests/mp08/node1/Makefile.am    | 4 ++--
 testsuites/mptests/mp08/node2/Makefile.am    | 4 ++--
 testsuites/mptests/mp09/node1/Makefile.am    | 4 ++--
 testsuites/mptests/mp09/node2/Makefile.am    | 4 ++--
 testsuites/mptests/mp10/node1/Makefile.am    | 4 ++--
 testsuites/mptests/mp10/node2/Makefile.am    | 4 ++--
 testsuites/mptests/mp11/node1/Makefile.am    | 4 ++--
 testsuites/mptests/mp11/node2/Makefile.am    | 4 ++--
 testsuites/mptests/mp12/node1/Makefile.am    | 4 ++--
 testsuites/mptests/mp12/node2/Makefile.am    | 4 ++--
 testsuites/mptests/mp13/node1/Makefile.am    | 4 ++--
 testsuites/mptests/mp13/node2/Makefile.am    | 4 ++--
 testsuites/mptests/mp14/node1/Makefile.am    | 4 ++--
 testsuites/mptests/mp14/node2/Makefile.am    | 4 ++--
 testsuites/mptests/mptests.am                | 2 ++
 testsuites/psxtests/psxtests.am              | 2 ++
 testsuites/samples/base_mp/node1/Makefile.am | 4 ++--
 testsuites/samples/base_mp/node2/Makefile.am | 4 ++--
 testsuites/samples/sample.am                 | 2 ++
 testsuites/sptests/sptests.am                | 2 ++
 testsuites/tmitrontests/tmitrontests.am      | 2 ++
 testsuites/tmtests/tmtests.am                | 2 ++
 38 files changed, 76 insertions(+), 60 deletions(-)

(limited to 'testsuites')

diff --git a/testsuites/itrontests/itrontests.am b/testsuites/itrontests/itrontests.am
index 25e96d366b..74bb1078ef 100644
--- a/testsuites/itrontests/itrontests.am
+++ b/testsuites/itrontests/itrontests.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/tests:
diff --git a/testsuites/libtests/libtests.am b/testsuites/libtests/libtests.am
index 577bac9fd2..2030f68d6c 100644
--- a/testsuites/libtests/libtests.am
+++ b/testsuites/libtests/libtests.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/tests:
diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am
index fcddeccc68..006791ee11 100644
--- a/testsuites/mptests/mp01/node1/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am
index 23a4b86a14..0e0a342b2d 100644
--- a/testsuites/mptests/mp01/node2/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am
index 0644447874..9349ba0029 100644
--- a/testsuites/mptests/mp02/node1/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am
index 570db75ea2..9386b56482 100644
--- a/testsuites/mptests/mp02/node2/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am
index 02ab109ef2..582fecb064 100644
--- a/testsuites/mptests/mp03/node1/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am
index 9ec135eac0..4744e85e00 100644
--- a/testsuites/mptests/mp03/node2/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am
index f1c48a32dd..e651e12c85 100644
--- a/testsuites/mptests/mp04/node1/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am
index 601919f21f..1e96e00a47 100644
--- a/testsuites/mptests/mp04/node2/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am
index a53e9b2c06..8b3d4c7982 100644
--- a/testsuites/mptests/mp05/node1/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am
index b27b2b81db..2f36e9793f 100644
--- a/testsuites/mptests/mp05/node2/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am
index c0394c36ca..8046e76329 100644
--- a/testsuites/mptests/mp06/node1/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am
index dc2c865598..c97464e677 100644
--- a/testsuites/mptests/mp06/node2/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am
index fd03da42a8..2cf3d2c56d 100644
--- a/testsuites/mptests/mp07/node1/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am
index c6d4173459..2620068f27 100644
--- a/testsuites/mptests/mp07/node2/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am
index 34331f026e..02bc0fa4dc 100644
--- a/testsuites/mptests/mp08/node1/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am
index dea01f6853..44cce51174 100644
--- a/testsuites/mptests/mp08/node2/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am
index aaea270e37..d2e175f363 100644
--- a/testsuites/mptests/mp09/node1/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am
index c9eccac036..8b4c36d222 100644
--- a/testsuites/mptests/mp09/node2/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am
index 7281b77bcf..c74d08bdc8 100644
--- a/testsuites/mptests/mp10/node1/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am
index 8750e465dc..f9202bbefa 100644
--- a/testsuites/mptests/mp10/node2/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am
index f86c54c1b7..83c85c864a 100644
--- a/testsuites/mptests/mp11/node1/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am
index 35f2608e54..01e208778e 100644
--- a/testsuites/mptests/mp11/node2/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am
index 9e3e61c6a4..c908401e87 100644
--- a/testsuites/mptests/mp12/node1/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am
index e860040919..d75f710f4e 100644
--- a/testsuites/mptests/mp12/node2/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am
index cfd2fa1a46..a85de6898c 100644
--- a/testsuites/mptests/mp13/node1/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am
index 5be99378aa..0d09a9c642 100644
--- a/testsuites/mptests/mp13/node2/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am
index e03c43c6ae..a8fa8f2da7 100644
--- a/testsuites/mptests/mp14/node1/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am
index 6b394e10d0..2381489d1c 100644
--- a/testsuites/mptests/mp14/node2/Makefile.am
+++ b/testsuites/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/testsuites/mptests/mptests.am b/testsuites/mptests/mptests.am
index 815ef8e00d..f7def3bbe0 100644
--- a/testsuites/mptests/mptests.am
+++ b/testsuites/mptests/mptests.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/tests:
diff --git a/testsuites/psxtests/psxtests.am b/testsuites/psxtests/psxtests.am
index 15a8e28c9b..dc03d45b16 100644
--- a/testsuites/psxtests/psxtests.am
+++ b/testsuites/psxtests/psxtests.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/tests:
diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
index fdf0db6e15..3a5a45e9e2 100644
--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ b/testsuites/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/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
index acfe772653..0810138fb8 100644
--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ b/testsuites/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/testsuites/samples/sample.am b/testsuites/samples/sample.am
index a294dcc949..dbd1482b9d 100644
--- a/testsuites/samples/sample.am
+++ b/testsuites/samples/sample.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/samples:
diff --git a/testsuites/sptests/sptests.am b/testsuites/sptests/sptests.am
index 0ef24f02dc..57a81ea7a0 100644
--- a/testsuites/sptests/sptests.am
+++ b/testsuites/sptests/sptests.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/tests:
diff --git a/testsuites/tmitrontests/tmitrontests.am b/testsuites/tmitrontests/tmitrontests.am
index 577bac9fd2..2030f68d6c 100644
--- a/testsuites/tmitrontests/tmitrontests.am
+++ b/testsuites/tmitrontests/tmitrontests.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/tests:
diff --git a/testsuites/tmtests/tmtests.am b/testsuites/tmtests/tmtests.am
index 577bac9fd2..2030f68d6c 100644
--- a/testsuites/tmtests/tmtests.am
+++ b/testsuites/tmtests/tmtests.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS += @DEFS@
+
 project_bspdir=$(PROJECT_ROOT)/@RTEMS_BSP@
 
 $(project_bspdir)/tests:
-- 
cgit v1.2.3