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.

54 files changed, 56 insertions, 53 deletions

diff --git a/aclocal/rtems-top.m4 b/aclocal/rtems-top.m4
index 0bf57da6d7..1def27cd1a 100644
--- a/aclocal/rtems-top.m4
+++ b/aclocal/rtems-top.m4
@@ -15,6 +15,10 @@ AC_ARG_WITH(target-subdir,
 TARGET_SUBDIR="$withval",
 TARGET_SUBDIR=".")
 
+## HACK to allow gnu-make conditionals in automake-Makefiles.
+ENDIF=endif
+AC_SUBST(ENDIF)
+
 RTEMS_TOPdir="$1";
 AC_SUBST(RTEMS_TOPdir)
 
diff --git a/c/src/exec/score/include/rtems/score/Makefile.am b/c/src/exec/score/include/rtems/score/Makefile.am
index 01468381c6..bcf11a067f 100644
--- a/c/src/exec/score/include/rtems/score/Makefile.am
+++ b/c/src/exec/score/include/rtems/score/Makefile.am
@@ -5,7 +5,6 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
 
 # We only build multiprocessing related files if HAS_MP was defined
 MP_H_FILES = mpci.h mppkt.h objectmp.h threadmp.h
diff --git a/c/src/tests/itrontests/itronmbf01/Makefile.am b/c/src/tests/itrontests/itronmbf01/Makefile.am
index d21723eda3..8162a6eaa9 100644
--- a/c/src/tests/itrontests/itronmbf01/Makefile.am
+++ b/c/src/tests/itrontests/itronmbf01/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/itronmbox01/Makefile.am b/c/src/tests/itrontests/itronmbox01/Makefile.am
index 5d4ce5e507..378db31023 100644
--- a/c/src/tests/itrontests/itronmbox01/Makefile.am
+++ b/c/src/tests/itrontests/itronmbox01/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/itronsem01/Makefile.am b/c/src/tests/itrontests/itronsem01/Makefile.am
index bfd003896f..609c8e5e0e 100644
--- a/c/src/tests/itrontests/itronsem01/Makefile.am
+++ b/c/src/tests/itrontests/itronsem01/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/psxtests/psx01/Makefile.am b/c/src/tests/psxtests/psx01/Makefile.am
index e16bf6234d..ec15f69df3 100644
--- a/c/src/tests/psxtests/psx01/Makefile.am
+++ b/c/src/tests/psxtests/psx01/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/psx02/Makefile.am b/c/src/tests/psxtests/psx02/Makefile.am
index 379c50442b..fecbfdb7d7 100644
--- a/c/src/tests/psxtests/psx02/Makefile.am
+++ b/c/src/tests/psxtests/psx02/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/psx03/Makefile.am b/c/src/tests/psxtests/psx03/Makefile.am
index fc91fe94e7..9fe6b2d5ad 100644
--- a/c/src/tests/psxtests/psx03/Makefile.am
+++ b/c/src/tests/psxtests/psx03/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/sptests/sp01/Makefile.am b/c/src/tests/sptests/sp01/Makefile.am
index 75bfbcc736..4326af5590 100644
--- a/c/src/tests/sptests/sp01/Makefile.am
+++ b/c/src/tests/sptests/sp01/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)/sptests.am
 
 ${PGM}: $(OBJS) $(LINK_FILES)
diff --git a/c/src/tests/sptests/sp02/Makefile.am b/c/src/tests/sptests/sp02/Makefile.am
index ea8b740cad..e24a3ea9c1 100644
--- a/c/src/tests/sptests/sp02/Makefile.am
+++ b/c/src/tests/sptests/sp02/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)/sptests.am
 
 ${PGM}: $(OBJS) $(LINK_FILES)
diff --git a/c/src/tests/sptests/sp03/Makefile.am b/c/src/tests/sptests/sp03/Makefile.am
index 4b3096643c..3189d05662 100644
--- a/c/src/tests/sptests/sp03/Makefile.am
+++ b/c/src/tests/sptests/sp03/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)/sptests.am
 
 ${PGM}: $(OBJS) $(LINK_FILES)
diff --git a/c/src/tests/sptests/sp04/Makefile.am b/c/src/tests/sptests/sp04/Makefile.am
index 07a6f11e46..fc16d8744f 100644
--- a/c/src/tests/sptests/sp04/Makefile.am
+++ b/c/src/tests/sptests/sp04/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)/sptests.am
 
 ${PGM}: $(OBJS) $(LINK_FILES)
diff --git a/c/src/tests/sptests/sp05/Makefile.am b/c/src/tests/sptests/sp05/Makefile.am
index e64f03ad97..2e34f3aafc 100644
--- a/c/src/tests/sptests/sp05/Makefile.am
+++ b/c/src/tests/sptests/sp05/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)/sptests.am
 
 ${PGM}: $(OBJS) $(LINK_FILES)
diff --git a/c/src/tests/sptests/sp06/Makefile.am b/c/src/tests/sptests/sp06/Makefile.am
index 2b6e8e7acb..04c4e1b6f6 100644
--- a/c/src/tests/sptests/sp06/Makefile.am
+++ b/c/src/tests/sptests/sp06/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)/sptests.am
 
 ${PGM}: $(OBJS) $(LINK_FILES)
diff --git a/c/src/tests/sptests/sp07/Makefile.am b/c/src/tests/sptests/sp07/Makefile.am
index 0b32e89e7f..23cc569501 100644
--- a/c/src/tests/sptests/sp07/Makefile.am
+++ b/c/src/tests/sptests/sp07/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)/sptests.am
 
 ${PGM}: $(OBJS) $(LINK_FILES)
diff --git a/c/src/tests/sptests/sp08/Makefile.am b/c/src/tests/sptests/sp08/Makefile.am
index b1970b863c..610a6d3f5f 100644
--- a/c/src/tests/sptests/sp08/Makefile.am
+++ b/c/src/tests/sptests/sp08/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)/sptests.am
 
 ${PGM}: $(OBJS) $(LINK_FILES)
diff --git a/c/src/tests/sptests/sp09/Makefile.am b/c/src/tests/sptests/sp09/Makefile.am
index f61470e2e6..786594f716 100644
--- a/c/src/tests/sptests/sp09/Makefile.am
+++ b/c/src/tests/sptests/sp09/Makefile.am
@@ -29,7 +29,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)/sptests.am
 
 ${PGM}: $(OBJS) $(LINK_FILES)
diff --git a/c/src/tests/sptests/sp11/Makefile.am b/c/src/tests/sptests/sp11/Makefile.am
index 89222d514d..31ab9a265e 100644
--- a/c/src/tests/sptests/sp11/Makefile.am
+++ b/c/src/tests/sptests/sp11/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)/sptests.am
 
 ${PGM}: $(OBJS) $(LINK_FILES)
diff --git a/c/src/tests/sptests/sp12/Makefile.am b/c/src/tests/sptests/sp12/Makefile.am
index 8f45e4bedc..2a633bc168 100644
--- a/c/src/tests/sptests/sp12/Makefile.am
+++ b/c/src/tests/sptests/sp12/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)/sptests.am
 
 ${PGM}: $(OBJS) $(LINK_FILES)
diff --git a/c/src/tests/sptests/sp13/Makefile.am b/c/src/tests/sptests/sp13/Makefile.am
index d6c57a86ff..52f39f5b16 100644
--- a/c/src/tests/sptests/sp13/Makefile.am
+++ b/c/src/tests/sptests/sp13/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)/sptests.am
 
 ${PGM}: $(OBJS) $(LINK_FILES)
diff --git a/c/src/tests/sptests/sp14/Makefile.am b/c/src/tests/sptests/sp14/Makefile.am
index 1687f9c0bf..6f1c8e4f46 100644
--- a/c/src/tests/sptests/sp14/Makefile.am
+++ b/c/src/tests/sptests/sp14/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)/sptests.am
 
 ${PGM}: $(OBJS) $(LINK_FILES)
diff --git a/c/src/tests/sptests/sp15/Makefile.am b/c/src/tests/sptests/sp15/Makefile.am
index aeebd7e9b8..4abe34b92e 100644
--- a/c/src/tests/sptests/sp15/Makefile.am
+++ b/c/src/tests/sptests/sp15/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)/sptests.am
 
 ${PGM}: $(OBJS) $(LINK_FILES)
diff --git a/c/src/tests/sptests/sp16/Makefile.am b/c/src/tests/sptests/sp16/Makefile.am
index a5299f2ed0..399258ee8f 100644
--- a/c/src/tests/sptests/sp16/Makefile.am
+++ b/c/src/tests/sptests/sp16/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)/sptests.am
 
 ${PGM}: $(OBJS) $(LINK_FILES)
diff --git a/c/src/tests/tmtests/tm01/Makefile.am b/c/src/tests/tmtests/tm01/Makefile.am
index 7fae5e28c7..88ed8a8a4a 100644
--- a/c/src/tests/tmtests/tm01/Makefile.am
+++ b/c/src/tests/tmtests/tm01/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm02/Makefile.am b/c/src/tests/tmtests/tm02/Makefile.am
index ecaddf4f81..dedb8e1be4 100644
--- a/c/src/tests/tmtests/tm02/Makefile.am
+++ b/c/src/tests/tmtests/tm02/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm03/Makefile.am b/c/src/tests/tmtests/tm03/Makefile.am
index f6b8cd86ea..335eb212df 100644
--- a/c/src/tests/tmtests/tm03/Makefile.am
+++ b/c/src/tests/tmtests/tm03/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm04/Makefile.am b/c/src/tests/tmtests/tm04/Makefile.am
index 9dc5b10e5c..e912842f60 100644
--- a/c/src/tests/tmtests/tm04/Makefile.am
+++ b/c/src/tests/tmtests/tm04/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm05/Makefile.am b/c/src/tests/tmtests/tm05/Makefile.am
index fa80ba3799..e42122119c 100644
--- a/c/src/tests/tmtests/tm05/Makefile.am
+++ b/c/src/tests/tmtests/tm05/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm06/Makefile.am b/c/src/tests/tmtests/tm06/Makefile.am
index 24a6f25988..ae2d88ffa0 100644
--- a/c/src/tests/tmtests/tm06/Makefile.am
+++ b/c/src/tests/tmtests/tm06/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm07/Makefile.am b/c/src/tests/tmtests/tm07/Makefile.am
index 0efde2c609..eb9b37a02f 100644
--- a/c/src/tests/tmtests/tm07/Makefile.am
+++ b/c/src/tests/tmtests/tm07/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm08/Makefile.am b/c/src/tests/tmtests/tm08/Makefile.am
index 4a1fb4c0bf..bf46fc48a4 100644
--- a/c/src/tests/tmtests/tm08/Makefile.am
+++ b/c/src/tests/tmtests/tm08/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm09/Makefile.am b/c/src/tests/tmtests/tm09/Makefile.am
index 3770facbfb..57e653bf49 100644
--- a/c/src/tests/tmtests/tm09/Makefile.am
+++ b/c/src/tests/tmtests/tm09/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm10/Makefile.am b/c/src/tests/tmtests/tm10/Makefile.am
index 9de2e37108..7ffe885de0 100644
--- a/c/src/tests/tmtests/tm10/Makefile.am
+++ b/c/src/tests/tmtests/tm10/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm11/Makefile.am b/c/src/tests/tmtests/tm11/Makefile.am
index b2d6f95a91..1882ab6f45 100644
--- a/c/src/tests/tmtests/tm11/Makefile.am
+++ b/c/src/tests/tmtests/tm11/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm12/Makefile.am b/c/src/tests/tmtests/tm12/Makefile.am
index 1895c02f35..ef0e238b97 100644
--- a/c/src/tests/tmtests/tm12/Makefile.am
+++ b/c/src/tests/tmtests/tm12/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm13/Makefile.am b/c/src/tests/tmtests/tm13/Makefile.am
index 503f9af375..ea5a868549 100644
--- a/c/src/tests/tmtests/tm13/Makefile.am
+++ b/c/src/tests/tmtests/tm13/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm14/Makefile.am b/c/src/tests/tmtests/tm14/Makefile.am
index 72f9c05e5d..b0adfdeb5f 100644
--- a/c/src/tests/tmtests/tm14/Makefile.am
+++ b/c/src/tests/tmtests/tm14/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm15/Makefile.am b/c/src/tests/tmtests/tm15/Makefile.am
index b057f3e52d..8e83dd064c 100644
--- a/c/src/tests/tmtests/tm15/Makefile.am
+++ b/c/src/tests/tmtests/tm15/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm16/Makefile.am b/c/src/tests/tmtests/tm16/Makefile.am
index 2226f48792..2f4e476814 100644
--- a/c/src/tests/tmtests/tm16/Makefile.am
+++ b/c/src/tests/tmtests/tm16/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm17/Makefile.am b/c/src/tests/tmtests/tm17/Makefile.am
index a7eeb79078..357de76c5e 100644
--- a/c/src/tests/tmtests/tm17/Makefile.am
+++ b/c/src/tests/tmtests/tm17/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm18/Makefile.am b/c/src/tests/tmtests/tm18/Makefile.am
index dc8fe8a126..531516f0c0 100644
--- a/c/src/tests/tmtests/tm18/Makefile.am
+++ b/c/src/tests/tmtests/tm18/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm19/Makefile.am b/c/src/tests/tmtests/tm19/Makefile.am
index 4d8075f847..89b257a67c 100644
--- a/c/src/tests/tmtests/tm19/Makefile.am
+++ b/c/src/tests/tmtests/tm19/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm20/Makefile.am b/c/src/tests/tmtests/tm20/Makefile.am
index b73fc5b6e9..6d37ff0f15 100644
--- a/c/src/tests/tmtests/tm20/Makefile.am
+++ b/c/src/tests/tmtests/tm20/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm21/Makefile.am b/c/src/tests/tmtests/tm21/Makefile.am
index da5c5bff60..e8141d2153 100644
--- a/c/src/tests/tmtests/tm21/Makefile.am
+++ b/c/src/tests/tmtests/tm21/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm22/Makefile.am b/c/src/tests/tmtests/tm22/Makefile.am
index 935b4a7d88..94f7892890 100644
--- a/c/src/tests/tmtests/tm22/Makefile.am
+++ b/c/src/tests/tmtests/tm22/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm23/Makefile.am b/c/src/tests/tmtests/tm23/Makefile.am
index 577d3f73e8..12290394f3 100644
--- a/c/src/tests/tmtests/tm23/Makefile.am
+++ b/c/src/tests/tmtests/tm23/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm24/Makefile.am b/c/src/tests/tmtests/tm24/Makefile.am
index 1a3f357826..3beb2ebe7e 100644
--- a/c/src/tests/tmtests/tm24/Makefile.am
+++ b/c/src/tests/tmtests/tm24/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm25/Makefile.am b/c/src/tests/tmtests/tm25/Makefile.am
index 7a8a9072db..46c59f3661 100644
--- a/c/src/tests/tmtests/tm25/Makefile.am
+++ b/c/src/tests/tmtests/tm25/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm26/Makefile.am b/c/src/tests/tmtests/tm26/Makefile.am
index 012086bb17..9d7b90f210 100644
--- a/c/src/tests/tmtests/tm26/Makefile.am
+++ b/c/src/tests/tmtests/tm26/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm27/Makefile.am b/c/src/tests/tmtests/tm27/Makefile.am
index d78440296b..39daffa7e7 100644
--- a/c/src/tests/tmtests/tm27/Makefile.am
+++ b/c/src/tests/tmtests/tm27/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm28/Makefile.am b/c/src/tests/tmtests/tm28/Makefile.am
index dbfe594e86..b99fa82c49 100644
--- a/c/src/tests/tmtests/tm28/Makefile.am
+++ b/c/src/tests/tmtests/tm28/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tm29/Makefile.am b/c/src/tests/tmtests/tm29/Makefile.am
index 8060d44a24..a65371062c 100644
--- a/c/src/tests/tmtests/tm29/Makefile.am
+++ b/c/src/tests/tmtests/tm29/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tmck/Makefile.am b/c/src/tests/tmtests/tmck/Makefile.am
index 6c03e2c36f..e6b21f4b85 100644
--- a/c/src/tests/tmtests/tmck/Makefile.am
+++ b/c/src/tests/tmtests/tmck/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)/tmtests.am
 
 #
diff --git a/c/src/tests/tmtests/tmoverhd/Makefile.am b/c/src/tests/tmtests/tmoverhd/Makefile.am
index 423c44da1f..106dbcbdf3 100644
--- a/c/src/tests/tmtests/tmoverhd/Makefile.am
+++ b/c/src/tests/tmtests/tmoverhd/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)/tmtests.am
 
 #