2001-09-28 Joel Sherrill <joel@OARcorp.com>

	* Generally add support for make-cxx-exe for all BSPs.
	* automake/leaf.am: New file.
	* aclocal/rtems-top.m4: Added ENDIF macro.
	* c/src/exec/score/include/rtems/score/Makefile.am,
	c/src/tests/itrontests/itronmbf01/Makefile.am,
	c/src/tests/itrontests/itronmbox01/Makefile.am,
	c/src/tests/itrontests/itronsem01/Makefile.am,
	c/src/tests/itrontests/itrontask01/Makefile.am,
	c/src/tests/itrontests/itrontask02/Makefile.am,
	c/src/tests/itrontests/itrontask03/Makefile.am,
	c/src/tests/itrontests/itrontask04/Makefile.am,
	c/src/tests/itrontests/itrontime01/Makefile.am,
	c/src/tests/libtests/cpuuse/Makefile.am,
	c/src/tests/libtests/malloctest/Makefile.am,
	c/src/tests/libtests/monitor/Makefile.am,
	c/src/tests/libtests/putenvtest/Makefile.am,
	c/src/tests/libtests/rtems++/Makefile.am,
	c/src/tests/libtests/rtmonuse/Makefile.am,
	c/src/tests/libtests/stackchk/Makefile.am,
	c/src/tests/libtests/termios/Makefile.am,
	c/src/tests/mptests/mp01/node1/Makefile.am,
	c/src/tests/mptests/mp01/node2/Makefile.am,
	c/src/tests/mptests/mp02/node1/Makefile.am,
	c/src/tests/mptests/mp02/node2/Makefile.am,
	c/src/tests/mptests/mp03/node1/Makefile.am,
	c/src/tests/mptests/mp03/node2/Makefile.am,
	c/src/tests/mptests/mp04/node1/Makefile.am,
	c/src/tests/mptests/mp04/node2/Makefile.am,
	c/src/tests/mptests/mp05/node1/Makefile.am,
	c/src/tests/mptests/mp05/node2/Makefile.am,
	c/src/tests/mptests/mp06/node1/Makefile.am,
	c/src/tests/mptests/mp06/node2/Makefile.am,
	c/src/tests/mptests/mp07/node1/Makefile.am,
	c/src/tests/mptests/mp07/node2/Makefile.am,
	c/src/tests/mptests/mp08/node1/Makefile.am,
	c/src/tests/mptests/mp08/node2/Makefile.am,
	c/src/tests/mptests/mp09/node1/Makefile.am,
	c/src/tests/mptests/mp09/node2/Makefile.am,
	c/src/tests/mptests/mp10/node1/Makefile.am,
	c/src/tests/mptests/mp10/node2/Makefile.am,
	c/src/tests/mptests/mp11/node1/Makefile.am,
	c/src/tests/mptests/mp11/node2/Makefile.am,
	c/src/tests/mptests/mp12/node1/Makefile.am,
	c/src/tests/mptests/mp12/node2/Makefile.am,
	c/src/tests/mptests/mp13/node1/Makefile.am,
	c/src/tests/mptests/mp13/node2/Makefile.am,
	c/src/tests/mptests/mp14/node1/Makefile.am,
	c/src/tests/mptests/mp14/node2/Makefile.am,
	c/src/tests/psxtests/psx01/Makefile.am,
	c/src/tests/psxtests/psx02/Makefile.am,
	c/src/tests/psxtests/psx03/Makefile.am,
	c/src/tests/psxtests/psx04/Makefile.am,
	c/src/tests/psxtests/psx05/Makefile.am,
	c/src/tests/psxtests/psx06/Makefile.am,
	c/src/tests/psxtests/psx07/Makefile.am,
	c/src/tests/psxtests/psx08/Makefile.am,
	c/src/tests/psxtests/psx09/Makefile.am,
	c/src/tests/psxtests/psx10/Makefile.am,
	c/src/tests/psxtests/psx11/Makefile.am,
	c/src/tests/psxtests/psx12/Makefile.am,
	c/src/tests/psxtests/psx13/Makefile.am,
	c/src/tests/psxtests/psxcancel/Makefile.am,
	c/src/tests/psxtests/psxfile01/Makefile.am,
	c/src/tests/psxtests/psxhdrs/Makefile.am,
	c/src/tests/psxtests/psxmount/Makefile.am,
	c/src/tests/psxtests/psxmsgq01/Makefile.am,
	c/src/tests/psxtests/psxreaddir/Makefile.am,
	c/src/tests/psxtests/psxsem01/Makefile.am,
	c/src/tests/psxtests/psxstat/Makefile.am,
	c/src/tests/psxtests/psxtime/Makefile.am,
	c/src/tests/psxtests/psxtimer/Makefile.am,
	c/src/tests/samples/base_mp/node1/Makefile.am,
	c/src/tests/samples/base_mp/node2/Makefile.am,
	c/src/tests/samples/base_sp/Makefile.am,
	c/src/tests/samples/cdtest/Makefile.am,
	c/src/tests/samples/hello/Makefile.am,
	c/src/tests/samples/minimum/Makefile.am,
	c/src/tests/samples/paranoia/Makefile.am,
	c/src/tests/samples/ticker/Makefile.am,
	c/src/tests/samples/unlimited/Makefile.am,
	c/src/tests/sptests/sp01/Makefile.am,
	c/src/tests/sptests/sp02/Makefile.am,
	c/src/tests/sptests/sp03/Makefile.am,
	c/src/tests/sptests/sp04/Makefile.am,
	c/src/tests/sptests/sp05/Makefile.am,
	c/src/tests/sptests/sp06/Makefile.am,
	c/src/tests/sptests/sp07/Makefile.am,
	c/src/tests/sptests/sp08/Makefile.am,
	c/src/tests/sptests/sp09/Makefile.am,
	c/src/tests/sptests/sp11/Makefile.am,
	c/src/tests/sptests/sp12/Makefile.am,
	c/src/tests/sptests/sp13/Makefile.am,
	c/src/tests/sptests/sp14/Makefile.am,
	c/src/tests/sptests/sp15/Makefile.am,
	c/src/tests/sptests/sp16/Makefile.am,
	c/src/tests/sptests/sp17/Makefile.am,
	c/src/tests/sptests/sp19/Makefile.am,
	c/src/tests/sptests/sp20/Makefile.am,
	c/src/tests/sptests/sp21/Makefile.am,
	c/src/tests/sptests/sp22/Makefile.am,
	c/src/tests/sptests/sp23/Makefile.am,
	c/src/tests/sptests/sp24/Makefile.am,
	c/src/tests/sptests/sp25/Makefile.am,
	c/src/tests/sptests/sp26/Makefile.am,
	c/src/tests/sptests/sp27/Makefile.am,
	c/src/tests/sptests/sp28/Makefile.am,
	c/src/tests/sptests/sp29/Makefile.am,
	c/src/tests/sptests/spfatal/Makefile.am,
	c/src/tests/sptests/spsize/Makefile.am,
	c/src/tests/support/stubdr/Makefile.am,
	c/src/tests/tmitrontests/tmitronsem01/Makefile.am,
	c/src/tests/tmtests/tm01/Makefile.am,
	c/src/tests/tmtests/tm02/Makefile.am,
	c/src/tests/tmtests/tm03/Makefile.am,
	c/src/tests/tmtests/tm04/Makefile.am,
	c/src/tests/tmtests/tm05/Makefile.am,
	c/src/tests/tmtests/tm06/Makefile.am,
	c/src/tests/tmtests/tm07/Makefile.am,
	c/src/tests/tmtests/tm08/Makefile.am,
	c/src/tests/tmtests/tm09/Makefile.am,
	c/src/tests/tmtests/tm10/Makefile.am,
	c/src/tests/tmtests/tm11/Makefile.am,
	c/src/tests/tmtests/tm12/Makefile.am,
	c/src/tests/tmtests/tm13/Makefile.am,
	c/src/tests/tmtests/tm14/Makefile.am,
	c/src/tests/tmtests/tm15/Makefile.am,
	c/src/tests/tmtests/tm16/Makefile.am,
	c/src/tests/tmtests/tm17/Makefile.am,
	c/src/tests/tmtests/tm18/Makefile.am,
	c/src/tests/tmtests/tm19/Makefile.am,
	c/src/tests/tmtests/tm20/Makefile.am,
	c/src/tests/tmtests/tm21/Makefile.am,
	c/src/tests/tmtests/tm22/Makefile.am,
	c/src/tests/tmtests/tm23/Makefile.am,
	c/src/tests/tmtests/tm24/Makefile.am,
	c/src/tests/tmtests/tm25/Makefile.am,
	c/src/tests/tmtests/tm26/Makefile.am,
	c/src/tests/tmtests/tm27/Makefile.am,
	c/src/tests/tmtests/tm28/Makefile.am,
	c/src/tests/tmtests/tm29/Makefile.am,
	c/src/tests/tmtests/tmck/Makefile.am,
	c/src/tests/tmtests/tmoverhd/Makefile.am: Use leaf.am instead of
	leaf.cfg.

68 files changed, 72 insertions, 74 deletions

diff --git a/c/src/lib/libcpu/sh/sh7045/include/Makefile.am b/c/src/lib/libcpu/sh/sh7045/include/Makefile.am
index 8a424d634f..d95b9adfb0 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7045/include/Makefile.am
@@ -4,7 +4,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_FILES = io_types.h null.h sci.h sh7_pfc.h sh7_sci.h
+H_FILES = null.h sci.h sh7_pfc.h sh7_sci.h
 
 # NOTE: Unlike other CPUS, we install into a subdirectory to avoid
 #       file name conflicts
diff --git a/c/src/tests/itrontests/itrontask01/Makefile.am b/c/src/tests/itrontests/itrontask01/Makefile.am
index 8cb34e5789..f5ddfb3f9c 100644
--- a/c/src/tests/itrontests/itrontask01/Makefile.am
+++ b/c/src/tests/itrontests/itrontask01/Makefile.am
@@ -24,7 +24,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/itrontests.am
 
 #
diff --git a/c/src/tests/itrontests/itrontask02/Makefile.am b/c/src/tests/itrontests/itrontask02/Makefile.am
index 89035793fe..66cfdd5a3a 100644
--- a/c/src/tests/itrontests/itrontask02/Makefile.am
+++ b/c/src/tests/itrontests/itrontask02/Makefile.am
@@ -24,7 +24,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/itrontests.am
 
 #
diff --git a/c/src/tests/itrontests/itrontask03/Makefile.am b/c/src/tests/itrontests/itrontask03/Makefile.am
index 779e2f0952..86474f5caa 100644
--- a/c/src/tests/itrontests/itrontask03/Makefile.am
+++ b/c/src/tests/itrontests/itrontask03/Makefile.am
@@ -24,7 +24,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/itrontests.am
 
 #
diff --git a/c/src/tests/itrontests/itrontask04/Makefile.am b/c/src/tests/itrontests/itrontask04/Makefile.am
index 063062ebf3..179e9ef47b 100644
--- a/c/src/tests/itrontests/itrontask04/Makefile.am
+++ b/c/src/tests/itrontests/itrontask04/Makefile.am
@@ -24,7 +24,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/itrontests.am
 
 #
diff --git a/c/src/tests/itrontests/itrontime01/Makefile.am b/c/src/tests/itrontests/itrontime01/Makefile.am
index 19c9538920..f8608881c7 100644
--- a/c/src/tests/itrontests/itrontime01/Makefile.am
+++ b/c/src/tests/itrontests/itrontime01/Makefile.am
@@ -24,7 +24,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/itrontests.am
 
 #
diff --git a/c/src/tests/libtests/cpuuse/Makefile.am b/c/src/tests/libtests/cpuuse/Makefile.am
index 3ab0a2ff2c..6753bbf8f5 100644
--- a/c/src/tests/libtests/cpuuse/Makefile.am
+++ b/c/src/tests/libtests/cpuuse/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/libtests.am
 
 #
diff --git a/c/src/tests/libtests/malloctest/Makefile.am b/c/src/tests/libtests/malloctest/Makefile.am
index 7cad5cfe92..776acaac02 100644
--- a/c/src/tests/libtests/malloctest/Makefile.am
+++ b/c/src/tests/libtests/malloctest/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/libtests.am
 
 #
diff --git a/c/src/tests/libtests/monitor/Makefile.am b/c/src/tests/libtests/monitor/Makefile.am
index 2d70524319..82fa92a7d8 100644
--- a/c/src/tests/libtests/monitor/Makefile.am
+++ b/c/src/tests/libtests/monitor/Makefile.am
@@ -26,7 +26,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/libtests.am
 
 #
diff --git a/c/src/tests/libtests/putenvtest/Makefile.am b/c/src/tests/libtests/putenvtest/Makefile.am
index a2c5d64616..47b240097d 100644
--- a/c/src/tests/libtests/putenvtest/Makefile.am
+++ b/c/src/tests/libtests/putenvtest/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/libtests.am
 
 #
diff --git a/c/src/tests/libtests/rtems++/Makefile.am b/c/src/tests/libtests/rtems++/Makefile.am
index 488b04eccf..6a3e746a87 100644
--- a/c/src/tests/libtests/rtems++/Makefile.am
+++ b/c/src/tests/libtests/rtems++/Makefile.am
@@ -25,18 +25,18 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/libtests.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-LD_LIBS += $(CPLUS_LD_LIBS)
-
 if HAS_CXX
+LD_LIBS += -lrtems++
+
 ${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
+	$(make-cxx-exe)
 
 all-local: $(ARCH) $(TMPINSTALL_FILES)
 else
diff --git a/c/src/tests/libtests/rtmonuse/Makefile.am b/c/src/tests/libtests/rtmonuse/Makefile.am
index 7a07738196..ac7132369c 100644
--- a/c/src/tests/libtests/rtmonuse/Makefile.am
+++ b/c/src/tests/libtests/rtmonuse/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/libtests.am
 
 #
diff --git a/c/src/tests/libtests/stackchk/Makefile.am b/c/src/tests/libtests/stackchk/Makefile.am
index 80ef6963bb..1bad53b6bd 100644
--- a/c/src/tests/libtests/stackchk/Makefile.am
+++ b/c/src/tests/libtests/stackchk/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/libtests.am
 
 #
diff --git a/c/src/tests/libtests/termios/Makefile.am b/c/src/tests/libtests/termios/Makefile.am
index 01f333be06..a65a740489 100644
--- a/c/src/tests/libtests/termios/Makefile.am
+++ b/c/src/tests/libtests/termios/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/libtests.am
 
 #
diff --git a/c/src/tests/mptests/mp01/node1/Makefile.am b/c/src/tests/mptests/mp01/node1/Makefile.am
index fcddeccc68..f11a09ae29 100644
--- a/c/src/tests/mptests/mp01/node1/Makefile.am
+++ b/c/src/tests/mptests/mp01/node1/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp01/node2/Makefile.am b/c/src/tests/mptests/mp01/node2/Makefile.am
index 23a4b86a14..681311f2f7 100644
--- a/c/src/tests/mptests/mp01/node2/Makefile.am
+++ b/c/src/tests/mptests/mp01/node2/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp02/node1/Makefile.am b/c/src/tests/mptests/mp02/node1/Makefile.am
index 0644447874..4cf15b4fe1 100644
--- a/c/src/tests/mptests/mp02/node1/Makefile.am
+++ b/c/src/tests/mptests/mp02/node1/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp02/node2/Makefile.am b/c/src/tests/mptests/mp02/node2/Makefile.am
index 570db75ea2..55da285292 100644
--- a/c/src/tests/mptests/mp02/node2/Makefile.am
+++ b/c/src/tests/mptests/mp02/node2/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp03/node1/Makefile.am b/c/src/tests/mptests/mp03/node1/Makefile.am
index 02ab109ef2..c2b31b3222 100644
--- a/c/src/tests/mptests/mp03/node1/Makefile.am
+++ b/c/src/tests/mptests/mp03/node1/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp03/node2/Makefile.am b/c/src/tests/mptests/mp03/node2/Makefile.am
index 9ec135eac0..e380b231df 100644
--- a/c/src/tests/mptests/mp03/node2/Makefile.am
+++ b/c/src/tests/mptests/mp03/node2/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp04/node1/Makefile.am b/c/src/tests/mptests/mp04/node1/Makefile.am
index f1c48a32dd..1eb1fac864 100644
--- a/c/src/tests/mptests/mp04/node1/Makefile.am
+++ b/c/src/tests/mptests/mp04/node1/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp04/node2/Makefile.am b/c/src/tests/mptests/mp04/node2/Makefile.am
index 601919f21f..2e7c993b03 100644
--- a/c/src/tests/mptests/mp04/node2/Makefile.am
+++ b/c/src/tests/mptests/mp04/node2/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp05/node1/Makefile.am b/c/src/tests/mptests/mp05/node1/Makefile.am
index a53e9b2c06..9c48717fb4 100644
--- a/c/src/tests/mptests/mp05/node1/Makefile.am
+++ b/c/src/tests/mptests/mp05/node1/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp05/node2/Makefile.am b/c/src/tests/mptests/mp05/node2/Makefile.am
index b27b2b81db..55c8df623d 100644
--- a/c/src/tests/mptests/mp05/node2/Makefile.am
+++ b/c/src/tests/mptests/mp05/node2/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp06/node1/Makefile.am b/c/src/tests/mptests/mp06/node1/Makefile.am
index c0394c36ca..3a9a74adaf 100644
--- a/c/src/tests/mptests/mp06/node1/Makefile.am
+++ b/c/src/tests/mptests/mp06/node1/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp06/node2/Makefile.am b/c/src/tests/mptests/mp06/node2/Makefile.am
index dc2c865598..1860001b88 100644
--- a/c/src/tests/mptests/mp06/node2/Makefile.am
+++ b/c/src/tests/mptests/mp06/node2/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp07/node1/Makefile.am b/c/src/tests/mptests/mp07/node1/Makefile.am
index fd03da42a8..2187f62358 100644
--- a/c/src/tests/mptests/mp07/node1/Makefile.am
+++ b/c/src/tests/mptests/mp07/node1/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp07/node2/Makefile.am b/c/src/tests/mptests/mp07/node2/Makefile.am
index c6d4173459..b412fc3041 100644
--- a/c/src/tests/mptests/mp07/node2/Makefile.am
+++ b/c/src/tests/mptests/mp07/node2/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp08/node1/Makefile.am b/c/src/tests/mptests/mp08/node1/Makefile.am
index 34331f026e..797cc431ac 100644
--- a/c/src/tests/mptests/mp08/node1/Makefile.am
+++ b/c/src/tests/mptests/mp08/node1/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp08/node2/Makefile.am b/c/src/tests/mptests/mp08/node2/Makefile.am
index dea01f6853..8aeb2a450b 100644
--- a/c/src/tests/mptests/mp08/node2/Makefile.am
+++ b/c/src/tests/mptests/mp08/node2/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp09/node1/Makefile.am b/c/src/tests/mptests/mp09/node1/Makefile.am
index aaea270e37..a994129994 100644
--- a/c/src/tests/mptests/mp09/node1/Makefile.am
+++ b/c/src/tests/mptests/mp09/node1/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp09/node2/Makefile.am b/c/src/tests/mptests/mp09/node2/Makefile.am
index c9eccac036..25977a551b 100644
--- a/c/src/tests/mptests/mp09/node2/Makefile.am
+++ b/c/src/tests/mptests/mp09/node2/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp10/node1/Makefile.am b/c/src/tests/mptests/mp10/node1/Makefile.am
index 7281b77bcf..e1514ac743 100644
--- a/c/src/tests/mptests/mp10/node1/Makefile.am
+++ b/c/src/tests/mptests/mp10/node1/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp10/node2/Makefile.am b/c/src/tests/mptests/mp10/node2/Makefile.am
index 8750e465dc..010c018d79 100644
--- a/c/src/tests/mptests/mp10/node2/Makefile.am
+++ b/c/src/tests/mptests/mp10/node2/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp11/node1/Makefile.am b/c/src/tests/mptests/mp11/node1/Makefile.am
index f86c54c1b7..21e159d4c8 100644
--- a/c/src/tests/mptests/mp11/node1/Makefile.am
+++ b/c/src/tests/mptests/mp11/node1/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp11/node2/Makefile.am b/c/src/tests/mptests/mp11/node2/Makefile.am
index 35f2608e54..42d7109e31 100644
--- a/c/src/tests/mptests/mp11/node2/Makefile.am
+++ b/c/src/tests/mptests/mp11/node2/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp12/node1/Makefile.am b/c/src/tests/mptests/mp12/node1/Makefile.am
index 9e3e61c6a4..f803b27579 100644
--- a/c/src/tests/mptests/mp12/node1/Makefile.am
+++ b/c/src/tests/mptests/mp12/node1/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp12/node2/Makefile.am b/c/src/tests/mptests/mp12/node2/Makefile.am
index e860040919..8d1544541c 100644
--- a/c/src/tests/mptests/mp12/node2/Makefile.am
+++ b/c/src/tests/mptests/mp12/node2/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp13/node1/Makefile.am b/c/src/tests/mptests/mp13/node1/Makefile.am
index cfd2fa1a46..3b4b790b97 100644
--- a/c/src/tests/mptests/mp13/node1/Makefile.am
+++ b/c/src/tests/mptests/mp13/node1/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp13/node2/Makefile.am b/c/src/tests/mptests/mp13/node2/Makefile.am
index 5be99378aa..4d6576c7a3 100644
--- a/c/src/tests/mptests/mp13/node2/Makefile.am
+++ b/c/src/tests/mptests/mp13/node2/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp14/node1/Makefile.am b/c/src/tests/mptests/mp14/node1/Makefile.am
index e03c43c6ae..ac6b2d565a 100644
--- a/c/src/tests/mptests/mp14/node1/Makefile.am
+++ b/c/src/tests/mptests/mp14/node1/Makefile.am
@@ -27,7 +27,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/mptests/mp14/node2/Makefile.am b/c/src/tests/mptests/mp14/node2/Makefile.am
index 6b394e10d0..c46ff22a47 100644
--- a/c/src/tests/mptests/mp14/node2/Makefile.am
+++ b/c/src/tests/mptests/mp14/node2/Makefile.am
@@ -27,7 +27,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/mptests.am
 
 if HAS_MP
diff --git a/c/src/tests/psxtests/psx04/Makefile.am b/c/src/tests/psxtests/psx04/Makefile.am
index 1a20658c84..25b3c63427 100644
--- a/c/src/tests/psxtests/psx04/Makefile.am
+++ b/c/src/tests/psxtests/psx04/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psx05/Makefile.am b/c/src/tests/psxtests/psx05/Makefile.am
index 37f065ddbb..e58aba9be1 100644
--- a/c/src/tests/psxtests/psx05/Makefile.am
+++ b/c/src/tests/psxtests/psx05/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psx06/Makefile.am b/c/src/tests/psxtests/psx06/Makefile.am
index 6d5a123fe5..028e629ed5 100644
--- a/c/src/tests/psxtests/psx06/Makefile.am
+++ b/c/src/tests/psxtests/psx06/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psx07/Makefile.am b/c/src/tests/psxtests/psx07/Makefile.am
index e530b09f1c..6bc6cba2ea 100644
--- a/c/src/tests/psxtests/psx07/Makefile.am
+++ b/c/src/tests/psxtests/psx07/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psx08/Makefile.am b/c/src/tests/psxtests/psx08/Makefile.am
index c027fcd470..9c37cfab46 100644
--- a/c/src/tests/psxtests/psx08/Makefile.am
+++ b/c/src/tests/psxtests/psx08/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psx09/Makefile.am b/c/src/tests/psxtests/psx09/Makefile.am
index 2a24e126a9..80a1a22eba 100644
--- a/c/src/tests/psxtests/psx09/Makefile.am
+++ b/c/src/tests/psxtests/psx09/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psx10/Makefile.am b/c/src/tests/psxtests/psx10/Makefile.am
index 6177343fe4..8ac2c2d2c0 100644
--- a/c/src/tests/psxtests/psx10/Makefile.am
+++ b/c/src/tests/psxtests/psx10/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psx11/Makefile.am b/c/src/tests/psxtests/psx11/Makefile.am
index ce26d0b405..a7fd714136 100644
--- a/c/src/tests/psxtests/psx11/Makefile.am
+++ b/c/src/tests/psxtests/psx11/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psx12/Makefile.am b/c/src/tests/psxtests/psx12/Makefile.am
index 36b542e921..1fdc88abc9 100644
--- a/c/src/tests/psxtests/psx12/Makefile.am
+++ b/c/src/tests/psxtests/psx12/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psx13/Makefile.am b/c/src/tests/psxtests/psx13/Makefile.am
index ea281ed444..c341d27835 100644
--- a/c/src/tests/psxtests/psx13/Makefile.am
+++ b/c/src/tests/psxtests/psx13/Makefile.am
@@ -22,7 +22,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psxcancel/Makefile.am b/c/src/tests/psxtests/psxcancel/Makefile.am
index 12046ffa82..ef9986b95f 100644
--- a/c/src/tests/psxtests/psxcancel/Makefile.am
+++ b/c/src/tests/psxtests/psxcancel/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psxfile01/Makefile.am b/c/src/tests/psxtests/psxfile01/Makefile.am
index f7e47ec4f9..6f31619746 100644
--- a/c/src/tests/psxtests/psxfile01/Makefile.am
+++ b/c/src/tests/psxtests/psxfile01/Makefile.am
@@ -22,7 +22,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psxhdrs/Makefile.am b/c/src/tests/psxtests/psxhdrs/Makefile.am
index 15da64193e..70788c69c7 100644
--- a/c/src/tests/psxtests/psxhdrs/Makefile.am
+++ b/c/src/tests/psxtests/psxhdrs/Makefile.am
@@ -31,7 +31,7 @@ SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 
 all-local: ${ARCH} ${OBJS}
 
diff --git a/c/src/tests/psxtests/psxmount/Makefile.am b/c/src/tests/psxtests/psxmount/Makefile.am
index 38eb85ec95..b0ce3274b5 100644
--- a/c/src/tests/psxtests/psxmount/Makefile.am
+++ b/c/src/tests/psxtests/psxmount/Makefile.am
@@ -22,7 +22,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psxmsgq01/Makefile.am b/c/src/tests/psxtests/psxmsgq01/Makefile.am
index 3cbb018a0d..5bd079df3d 100644
--- a/c/src/tests/psxtests/psxmsgq01/Makefile.am
+++ b/c/src/tests/psxtests/psxmsgq01/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psxreaddir/Makefile.am b/c/src/tests/psxtests/psxreaddir/Makefile.am
index 6fb2c67812..f77a91becc 100644
--- a/c/src/tests/psxtests/psxreaddir/Makefile.am
+++ b/c/src/tests/psxtests/psxreaddir/Makefile.am
@@ -22,7 +22,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psxsem01/Makefile.am b/c/src/tests/psxtests/psxsem01/Makefile.am
index 2fe85227b4..6900be8e4b 100644
--- a/c/src/tests/psxtests/psxsem01/Makefile.am
+++ b/c/src/tests/psxtests/psxsem01/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psxstat/Makefile.am b/c/src/tests/psxtests/psxstat/Makefile.am
index 19e747cdbe..be11c943be 100644
--- a/c/src/tests/psxtests/psxstat/Makefile.am
+++ b/c/src/tests/psxtests/psxstat/Makefile.am
@@ -22,7 +22,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psxtime/Makefile.am b/c/src/tests/psxtests/psxtime/Makefile.am
index 12908cdede..6ef9b51de0 100644
--- a/c/src/tests/psxtests/psxtime/Makefile.am
+++ b/c/src/tests/psxtests/psxtime/Makefile.am
@@ -22,7 +22,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/psxtests/psxtimer/Makefile.am b/c/src/tests/psxtests/psxtimer/Makefile.am
index 6d21b85a75..fd1442f801 100644
--- a/c/src/tests/psxtests/psxtimer/Makefile.am
+++ b/c/src/tests/psxtests/psxtimer/Makefile.am
@@ -25,7 +25,7 @@ PRINT_SRCS = $(DOCS)
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/psxtests.am
 
 #
diff --git a/c/src/tests/samples/base_mp/node1/Makefile.am b/c/src/tests/samples/base_mp/node1/Makefile.am
index fdf0db6e15..7fcd0ef653 100644
--- a/c/src/tests/samples/base_mp/node1/Makefile.am
+++ b/c/src/tests/samples/base_mp/node1/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/sample.am
 
 if HAS_MP
diff --git a/c/src/tests/samples/base_mp/node2/Makefile.am b/c/src/tests/samples/base_mp/node2/Makefile.am
index acfe772653..6c32cb0df9 100644
--- a/c/src/tests/samples/base_mp/node2/Makefile.am
+++ b/c/src/tests/samples/base_mp/node2/Makefile.am
@@ -26,7 +26,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/sample.am
 
 if HAS_MP
diff --git a/c/src/tests/samples/base_sp/Makefile.am b/c/src/tests/samples/base_sp/Makefile.am
index 2add0e0096..d8252f8da9 100644
--- a/c/src/tests/samples/base_sp/Makefile.am
+++ b/c/src/tests/samples/base_sp/Makefile.am
@@ -24,7 +24,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/sample.am
 
 #
diff --git a/c/src/tests/samples/cdtest/Makefile.am b/c/src/tests/samples/cdtest/Makefile.am
index 309974bb4f..893804197f 100644
--- a/c/src/tests/samples/cdtest/Makefile.am
+++ b/c/src/tests/samples/cdtest/Makefile.am
@@ -27,7 +27,7 @@ OBJS = $(C_O_FILES) $(CC_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/sample.am
 
 #
@@ -35,10 +35,8 @@ include $(top_srcdir)/sample.am
 #
 
 if HAS_CXX
-LD_LIBS += $(CPLUS_LD_LIBS)
-
 ${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
+	$(make-cxx-exe)
 
 all-local: ${ARCH} $(TMPINSTALL_FILES)
 else
diff --git a/c/src/tests/samples/hello/Makefile.am b/c/src/tests/samples/hello/Makefile.am
index 9dfe2bafac..85deaeabea 100644
--- a/c/src/tests/samples/hello/Makefile.am
+++ b/c/src/tests/samples/hello/Makefile.am
@@ -24,7 +24,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/sample.am
 
 #
diff --git a/c/src/tests/samples/minimum/Makefile.am b/c/src/tests/samples/minimum/Makefile.am
index 6ebaef357d..d9c8db86cb 100644
--- a/c/src/tests/samples/minimum/Makefile.am
+++ b/c/src/tests/samples/minimum/Makefile.am
@@ -21,7 +21,7 @@ OBJS = $(C_O_FILES)
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../automake/leaf.am
 include $(top_srcdir)/sample.am
 
 #