Rework.

11 files changed, 71 insertions, 294 deletions

diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am
index e4f65cc687..71dfbf6111 100644
--- a/testsuites/samples/base_sp/Makefile.am
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -9,43 +9,23 @@ MANAGERS = io
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c apptask.c system.h
 
-DOCS = base_sp.doc base_sp.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = base_sp.scn
+docdir = $(testsdir)
+dist_doc_DATA = base_sp.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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/base_sp.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/base_sp.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/base_sp.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/base_sp.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
+tests_SCRIPTS = $(PGM)
 
-all-local: $(TMPINSTALL_FILES)
-
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index 0e9b9c441a..ecab477989 100644
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -9,47 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c main.cc system.h
 
-DOCS = cdtest.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = cdtest.scn
 
 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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/cdtest.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/cdtest.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/cdtest.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/cdtest.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 # AM_CPPFLAGS += -DRTEMS_TEST_IO_STREAM
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-cxx-exe)
-
-all-local: $(TMPINSTALL_FILES)
+tests_SCRIPTS = $(PGM)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-cxx-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am
index 61f1d559fc..2f3e7579c9 100644
--- a/testsuites/samples/fileio/Makefile.am
+++ b/testsuites/samples/fileio/Makefile.am
@@ -2,52 +2,33 @@
 ##  Makefile.am,v 1.9 2002/08/11 05:18:59 ralf Exp
 ##
 
-PGM = ${ARCH}/fileio.exe
 
 MANAGERS = io message semaphore
 
 if LIBCHIP
+PGM = ${ARCH}/fileio.exe
+
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 OBJS = $(lib_a_OBJECTS)
-endif
 
-DOCS = fileio.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = fileio.doc
+endif
 
 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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/fileio.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/fileio.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/fileio.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/fileio.exe
 
+if LIBCHIP
 $(PGM): ${ARCH}/$(dirstamp)
 
+tests_SCRIPTS = $(PGM)
 
-if LIBCHIP
-all-local: $(TMPINSTALL_FILES)
-
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 endif
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index 6667f3c485..f10bd46fde 100644
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -9,43 +9,23 @@ MANAGERS = io
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = hello.doc hello.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = hello.scn
+docdir = $(testsdir)
+dist_doc_DATA = hello.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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/hello.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/hello.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/hello.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/hello.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
+tests_SCRIPTS = $(PGM)
 
-all-local: $(TMPINSTALL_FILES)
-
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am
index b2d24fddec..3b18f6120a 100644
--- a/testsuites/samples/iostream/Makefile.am
+++ b/testsuites/samples/iostream/Makefile.am
@@ -9,43 +9,23 @@ MANAGERS = io
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.cc system.h
 
-DOCS = iostream.doc iostream.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = iostream.scn
+docdir = $(testsdir)
+dist_doc_DATA = iostream.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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/iostream.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/iostream.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/iostream.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/iostream.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
+tests_SCRIPTS = $(PGM)
 
-all-local: $(TMPINSTALL_FILES)
-
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-cxx-exe)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am
index 985fe31946..471b33628a 100644
--- a/testsuites/samples/loopback/Makefile.am
+++ b/testsuites/samples/loopback/Makefile.am
@@ -9,43 +9,21 @@ MANAGERS = io event
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS = loopback.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = loopback.scn
 
 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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/loopback.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/loopback.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/loopback.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/loopback.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
+tests_SCRIPTS = $(PGM)
 
-all-local: $(TMPINSTALL_FILES)
-
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
index f2fd1c29e5..d9e2f52b52 100644
--- a/testsuites/samples/minimum/Makefile.am
+++ b/testsuites/samples/minimum/Makefile.am
@@ -9,44 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS = minimum.doc minimum.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = minimum.scn
+docdir = $(testsdir)
+dist_doc_DATA = minimum.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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/minimum.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/minimum.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/minimum.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/minimum.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
-all-local: $(TMPINSTALL_FILES)
 # 	This test should not be executed
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
+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/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index c735184a3a..3509d54348 100644
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -9,48 +9,27 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c paranoia.c system.h
 
-DOCS = paranoia.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = paranoia.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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/paranoia.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/paranoia.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/paranoia.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/paranoia.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
 #  -DCYGNUS   turns on more verbose msgs
-
 AM_CPPFLAGS += -DNOSIGNAL -DCYGNUS -DNOMAIN
 
 LD_LIBS = -lm
 
-all-local: $(TMPINSTALL_FILES)
+tests_SCRIPTS = $(PGM)
 
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am
index 4427d8f2ef..d7b37fd9e7 100644
--- a/testsuites/samples/pppd/Makefile.am
+++ b/testsuites/samples/pppd/Makefile.am
@@ -11,39 +11,19 @@ lib_a_SOURCES = init.c pppdapp.c netconfig.h system.h
 
 OBJS = $(lib_a_OBJECTS)
 
+testsdir = $(libdir)/tests
 
 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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/pppd.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/pppd.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/pppd.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/pppd.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 LD_LIBS = -lpppd
 
-all-local: $(TMPINSTALL_FILES)
+tests_SCRIPTS = $(PGM)
 
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
index 8777cf8b34..15ff8ad8d9 100644
--- a/testsuites/samples/ticker/Makefile.am
+++ b/testsuites/samples/ticker/Makefile.am
@@ -9,43 +9,23 @@ MANAGERS = io
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c tasks.c system.h
 
-DOCS = ticker.doc ticker.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = ticker.scn
+docdir = $(testsdir)
+dist_doc_DATA = ticker.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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/ticker.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/ticker.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/ticker.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/ticker.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
+tests_SCRIPTS = $(PGM)
 
-all-local: $(TMPINSTALL_FILES)
-
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
index 49ed749801..98c4f47934 100644
--- a/testsuites/samples/unlimited/Makefile.am
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -9,43 +9,23 @@ MANAGERS = io event
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c test1.c test2.c test3.c system.h
 
-DOCS = unlimited.doc unlimited.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = unlimited.scn
+docdir = $(testsdir)
+dist_doc_DATA = unlimited.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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/unlimited.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/unlimited.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/unlimited.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/unlimited.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
+tests_SCRIPTS = $(PGM)
 
-all-local: $(TMPINSTALL_FILES)
-
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am