Expand sample.am.

13 files changed, 260 insertions, 13 deletions

diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
index 2676f9476d..42f81b5312 100644
--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ b/testsuites/samples/base_mp/node1/Makefile.am
@@ -19,7 +19,26 @@ OBJS = $(lib_a_OBJECTS)
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sample.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/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
 
diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
index 5acdcae697..039f19db08 100644
--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ b/testsuites/samples/base_mp/node2/Makefile.am
@@ -19,7 +19,26 @@ OBJS = $(lib_a_OBJECTS)
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sample.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/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -DNODE_NUMBER=$(NODE) -I.
 
diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am
index 2c406f5c6c..5aec7911d3 100644
--- a/testsuites/samples/base_sp/Makefile.am
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -18,7 +18,26 @@ OBJS = $(lib_a_OBJECTS)
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sample.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/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index 4b66b8426a..8dc5a5acf4 100644
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -18,7 +18,26 @@ OBJS = $(lib_a_OBJECTS)
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sample.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/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 # AM_CPPFLAGS += -DRTEMS_TEST_IO_STREAM
 
diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am
index 54f66cd936..256bbe72e7 100644
--- a/testsuites/samples/fileio/Makefile.am
+++ b/testsuites/samples/fileio/Makefile.am
@@ -18,7 +18,26 @@ DOCS = $(TEST).doc
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sample.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/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index b6d07c6464..ffc86c89a2 100644
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -18,7 +18,26 @@ OBJS = $(lib_a_OBJECTS)
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sample.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/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am
index a7394f6610..8c1edd6d9d 100644
--- a/testsuites/samples/iostream/Makefile.am
+++ b/testsuites/samples/iostream/Makefile.am
@@ -18,7 +18,26 @@ OBJS = $(lib_a_OBJECTS)
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sample.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/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am
index 18f6f02e3b..287ed218c5 100644
--- a/testsuites/samples/loopback/Makefile.am
+++ b/testsuites/samples/loopback/Makefile.am
@@ -18,7 +18,26 @@ OBJS = $(lib_a_OBJECTS)
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sample.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/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
index 26cee5a052..e303605ba4 100644
--- a/testsuites/samples/minimum/Makefile.am
+++ b/testsuites/samples/minimum/Makefile.am
@@ -18,7 +18,26 @@ OBJS = $(lib_a_OBJECTS)
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sample.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/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index 526ef6d42b..8f745ae2de 100644
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -18,7 +18,26 @@ OBJS = $(lib_a_OBJECTS)
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sample.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/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am
index 1a733d9482..a6ae08c8c6 100644
--- a/testsuites/samples/pppd/Makefile.am
+++ b/testsuites/samples/pppd/Makefile.am
@@ -16,7 +16,26 @@ OBJS = $(lib_a_OBJECTS)
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sample.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/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
index 3e4c3e955f..2640dfd5ab 100644
--- a/testsuites/samples/ticker/Makefile.am
+++ b/testsuites/samples/ticker/Makefile.am
@@ -18,7 +18,26 @@ OBJS = $(lib_a_OBJECTS)
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sample.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/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
index 43c264bb0f..e2753aed71 100644
--- a/testsuites/samples/unlimited/Makefile.am
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -18,7 +18,26 @@ OBJS = $(lib_a_OBJECTS)
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sample.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/$(TEST).exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+	$(INSTALL_PROGRAM) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/samples/$(TEST).exe
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=