9 files changed, 72 insertions, 279 deletions
diff --git a/testsuites/itrontests/itronhello/Makefile.am b/testsuites/itrontests/itronhello/Makefile.am
index 5a542f8daa..f00d66ebe5 100644
--- a/testsuites/itrontests/itronhello/Makefile.am
+++ b/testsuites/itrontests/itronhello/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = itronhello.doc itronhello.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itronhello.scn
+docdir = $(testsdir)
+dist_doc_DATA = itronhello.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/itronhello.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/itrontests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
-	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/itrontests/itronhello.scn: itronhello.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itronhello.exe \
-$(project_bspdir)/tests/screens/itrontests/itronhello.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itronmbf01/Makefile.am b/testsuites/itrontests/itronmbf01/Makefile.am
index 5691eba9a2..df8f999bd5 100644
--- a/testsuites/itrontests/itronmbf01/Makefile.am
+++ b/testsuites/itrontests/itronmbf01/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = itronmbf01.doc itronmbf01.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itronmbf01.scn
+docdir = $(testsdir)
+dist_doc_DATA = itronmbf01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/itronmbf01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/itrontests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
-	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/itrontests/itronmbf01.scn: itronmbf01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itronmbf01.exe \
-$(project_bspdir)/tests/screens/itrontests/itronmbf01.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itronmbox01/Makefile.am b/testsuites/itrontests/itronmbox01/Makefile.am
index 6b0c1472f6..4e18e54046 100644
--- a/testsuites/itrontests/itronmbox01/Makefile.am
+++ b/testsuites/itrontests/itronmbox01/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = itronmbox01.doc itronmbox01.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itronmbox01.scn
+docdir = $(testsdir)
+dist_doc_DATA = itronmbox01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/itronmbox01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/itrontests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
-	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/itrontests/itronmbox01.scn: itronmbox01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itronmbox01.exe \
-$(project_bspdir)/tests/screens/itrontests/itronmbox01.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itronsem01/Makefile.am b/testsuites/itrontests/itronsem01/Makefile.am
index 4d3271c1a0..21449bbdb2 100644
--- a/testsuites/itrontests/itronsem01/Makefile.am
+++ b/testsuites/itrontests/itronsem01/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = itronsem01.doc itronsem01.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itronsem01.scn
+docdir = $(testsdir)
+dist_doc_DATA = itronsem01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/itronsem01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/itrontests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
-	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/itrontests/itronsem01.scn: itronsem01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itronsem01.exe \
-$(project_bspdir)/tests/screens/itrontests/itronsem01.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask01/Makefile.am b/testsuites/itrontests/itrontask01/Makefile.am
index 17647a886f..54d6817850 100644
--- a/testsuites/itrontests/itrontask01/Makefile.am
+++ b/testsuites/itrontests/itrontask01/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = itrontask01.doc itrontask01.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itrontask01.scn
+docdir = $(testsdir)
+dist_doc_DATA = itrontask01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/itrontask01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/itrontests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
-	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/itrontests/itrontask01.scn: itrontask01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itrontask01.exe \
-$(project_bspdir)/tests/screens/itrontests/itrontask01.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask02/Makefile.am b/testsuites/itrontests/itrontask02/Makefile.am
index 78231e4020..866f30267d 100644
--- a/testsuites/itrontests/itrontask02/Makefile.am
+++ b/testsuites/itrontests/itrontask02/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c dormant.c system.h
 
-DOCS = itrontask02.doc itrontask02.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itrontask02.scn
+docdir = $(testsdir)
+dist_doc_DATA = itrontask02.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/itrontask02.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/itrontests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
-	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/itrontests/itrontask02.scn: itrontask02.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itrontask02.exe \
-$(project_bspdir)/tests/screens/itrontests/itrontask02.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask03/Makefile.am b/testsuites/itrontests/itrontask03/Makefile.am
index 9392540627..a1bb5a0349 100644
--- a/testsuites/itrontests/itrontask03/Makefile.am
+++ b/testsuites/itrontests/itrontask03/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c preempt.c task1.c task2.c task3.c system.h
 
-DOCS = itrontask03.doc itrontask03.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itrontask03.scn
+docdir = $(testsdir)
+dist_doc_DATA = itrontask03.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/itrontask03.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/itrontests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
-	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/itrontests/itrontask03.scn: itrontask03.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itrontask03.exe \
-$(project_bspdir)/tests/screens/itrontests/itrontask03.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask04/Makefile.am b/testsuites/itrontests/itrontask04/Makefile.am
index 54ad92fc56..9672582ba1 100644
--- a/testsuites/itrontests/itrontask04/Makefile.am
+++ b/testsuites/itrontests/itrontask04/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
 
-DOCS = itrontask04.doc itrontask04.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itrontask04.scn
+docdir = $(testsdir)
+dist_doc_DATA = itrontask04.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/itrontask04.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/itrontests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
-	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/itrontests/itrontask04.scn: itrontask04.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itrontask04.exe \
-$(project_bspdir)/tests/screens/itrontests/itrontask04.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontime01/Makefile.am b/testsuites/itrontests/itrontime01/Makefile.am
index 99d820d892..9e51654861 100644
--- a/testsuites/itrontests/itrontime01/Makefile.am
+++ b/testsuites/itrontests/itrontime01/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = itrontime01.doc itrontime01.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itrontime01.scn
+docdir = $(testsdir)
+dist_doc_DATA = itrontime01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/itrontime01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/itrontests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
-	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/itrontests/itrontime01.scn: itrontime01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itrontime01.exe \
-$(project_bspdir)/tests/screens/itrontests/itrontime01.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am