8 files changed, 16 insertions, 32 deletions
diff --git a/c/src/tests/libtests/Makefile.in b/c/src/tests/libtests/Makefile.in
index 4c6694ddde..004100a86e 100644
--- a/c/src/tests/libtests/Makefile.in
+++ b/c/src/tests/libtests/Makefile.in
@@ -4,13 +4,11 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/directory.cfg
 
 # We only build the tests for the rtems++ library if HAS_CPLUSPLUS was defined
diff --git a/c/src/tests/libtests/cpuuse/Makefile.in b/c/src/tests/libtests/cpuuse/Makefile.in
index 8e1644e522..22ef7819d2 100644
--- a/c/src/tests/libtests/cpuuse/Makefile.in
+++ b/c/src/tests/libtests/cpuuse/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 TEST=cpuuse
 
@@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/libtests/malloctest/Makefile.in b/c/src/tests/libtests/malloctest/Makefile.in
index 1a49c20da2..ca7c4cb1f6 100644
--- a/c/src/tests/libtests/malloctest/Makefile.in
+++ b/c/src/tests/libtests/malloctest/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 TEST=malloctest
 
@@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/libtests/monitor/Makefile.in b/c/src/tests/libtests/monitor/Makefile.in
index c93f2f4647..e264fe9f9b 100644
--- a/c/src/tests/libtests/monitor/Makefile.in
+++ b/c/src/tests/libtests/monitor/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 TEST=monitor
 
@@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/libtests/rtems++/Makefile.in b/c/src/tests/libtests/rtems++/Makefile.in
index 69ffdd8d80..f909b618b9 100644
--- a/c/src/tests/libtests/rtems++/Makefile.in
+++ b/c/src/tests/libtests/rtems++/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 TEST=rtems++
 
@@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/libtests/rtmonuse/Makefile.in b/c/src/tests/libtests/rtmonuse/Makefile.in
index 37874ff3c0..9c9ea2e366 100644
--- a/c/src/tests/libtests/rtmonuse/Makefile.in
+++ b/c/src/tests/libtests/rtmonuse/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 TEST=rtmonuse
 
@@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/libtests/stackchk/Makefile.in b/c/src/tests/libtests/stackchk/Makefile.in
index 1c88e6f604..462f83fb6c 100644
--- a/c/src/tests/libtests/stackchk/Makefile.in
+++ b/c/src/tests/libtests/stackchk/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 TEST=stackchk
 
@@ -31,7 +29,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(TEST).exe
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #
diff --git a/c/src/tests/libtests/termios/Makefile.in b/c/src/tests/libtests/termios/Makefile.in
index d8eebfd8e6..c575570f9e 100644
--- a/c/src/tests/libtests/termios/Makefile.in
+++ b/c/src/tests/libtests/termios/Makefile.in
@@ -4,11 +4,9 @@
 
 @SET_MAKE@
 srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-RTEMS_ROOT = @RTEMS_ROOT@
+RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
-RTEMS_CUSTOM = $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 
 SAMPLE=termios
 PGM=${ARCH}/$(SAMPLE).exe
@@ -32,7 +30,7 @@ PRINT_SRCS=$(DOCS)
 
 PGM=${ARCH}/$(SAMPLE).exe
 
-include $(RTEMS_CUSTOM)
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 
 #