8 files changed, 46 insertions, 183 deletions
diff --git a/testsuites/libtests/cpuuse/Makefile.am b/testsuites/libtests/cpuuse/Makefile.am
index 44c961d609..76c1a131dc 100644
--- a/testsuites/libtests/cpuuse/Makefile.am
+++ b/testsuites/libtests/cpuuse/Makefile.am
@@ -2,46 +2,30 @@
 ## $Id$
 ##
 
-
 MANAGERS = io rate_monotonic
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
 
-DOCS = cpuuse.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = cpuuse.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/cpuuse.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/cpuuse.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/cpuuse.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
+tests_SCRIPTS = $(PGM)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/malloctest/Makefile.am b/testsuites/libtests/malloctest/Makefile.am
index 6dfa369e6e..e539b38d2a 100644
--- a/testsuites/libtests/malloctest/Makefile.am
+++ b/testsuites/libtests/malloctest/Makefile.am
@@ -2,46 +2,30 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = malloctest.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = malloctest.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/malloctest.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/malloctest.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/malloctest.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
+tests_SCRIPTS = $(PGM)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/monitor/Makefile.am b/testsuites/libtests/monitor/Makefile.am
index d7478ff1f0..a07f2d3e27 100644
--- a/testsuites/libtests/monitor/Makefile.am
+++ b/testsuites/libtests/monitor/Makefile.am
@@ -2,47 +2,29 @@
 ## $Id$
 ##
 
-
 MANAGERS = dpmem event io msg mp part region sem signal timer rate_monotonic \
     ext
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = monitor.scn
+testsdir = $(libdir)/tests
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/monitor.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/monitor.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/monitor.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
+tests_SCRIPTS = $(PGM)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/putenvtest/Makefile.am b/testsuites/libtests/putenvtest/Makefile.am
index eb6b667dd7..4d4a30114a 100644
--- a/testsuites/libtests/putenvtest/Makefile.am
+++ b/testsuites/libtests/putenvtest/Makefile.am
@@ -2,46 +2,28 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS =
+testsdir = $(libdir)/tests
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/putenvtest.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/putenvtest.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/putenvtest.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
+tests_SCRIPTS = $(PGM)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/rtems++/Makefile.am b/testsuites/libtests/rtems++/Makefile.am
index e4445ec057..6bd6a1299a 100644
--- a/testsuites/libtests/rtems++/Makefile.am
+++ b/testsuites/libtests/rtems++/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 MANAGERS = event io msg sem signal timer rate_monotonic
 
 if HAS_CXX
@@ -10,9 +9,11 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = Init.cc Task1.cc Task2.cc Task3.cc System.h
 endif
 
-DOCS = rtems++.scn rtems++.doc
-
-
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = rtems++.scn
+docdir = $(testsdir)
+dist_doc_DATA = rtems++.doc
 
 PGM = ${ARCH}/rtems++.exe
 
@@ -20,36 +21,16 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/rtems++.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/rtems++.exe
-
-$(PGM): ${ARCH}/$(dirstamp)
-
-
+if HAS_CXX
 LD_LIBS = -lrtems++
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-if HAS_CXX
+tests_SCRIPTS = $(PGM)
 
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+$(PGM): ${ARCH}/$(dirstamp)
 
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-cxx-exe)
-
-all-local: $(TMPINSTALL_FILES)
-else
-all-local:
 endif
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/rtmonuse/Makefile.am b/testsuites/libtests/rtmonuse/Makefile.am
index 4fc8760431..54790d7e60 100644
--- a/testsuites/libtests/rtmonuse/Makefile.am
+++ b/testsuites/libtests/rtmonuse/Makefile.am
@@ -2,46 +2,30 @@
 ## $Id$
 ##
 
-
 MANAGERS = io rate_monotonic
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c getall.c task1.c system.h
 
-DOCS = rtmonuse.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = rtmonuse.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/rtmonuse.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/rtmonuse.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/rtmonuse.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
+tests_SCRIPTS = $(PGM)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/stackchk/Makefile.am b/testsuites/libtests/stackchk/Makefile.am
index 4d5a50ff5e..c7eb439a78 100644
--- a/testsuites/libtests/stackchk/Makefile.am
+++ b/testsuites/libtests/stackchk/Makefile.am
@@ -2,46 +2,30 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = blow.c init.c task1.c system.h
 
-DOCS = stackchk.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = stackchk.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/stackchk.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/stackchk.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/stackchk.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
+tests_SCRIPTS = $(PGM)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/termios/Makefile.am b/testsuites/libtests/termios/Makefile.am
index a6fe4905d7..31197d6826 100644
--- a/testsuites/libtests/termios/Makefile.am
+++ b/testsuites/libtests/termios/Makefile.am
@@ -2,46 +2,28 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS =
+testsdir = $(libdir)/tests
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/termios.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/termios.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/termios.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
+tests_SCRIPTS = $(PGM)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am