summaryrefslogtreecommitdiffstats
path: root/testsuites/samples/base_mp
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2018-04-09 13:44:01 +1000
committerChris Johns <chrisj@rtems.org>2018-04-10 08:24:54 +1000
commitd027e6bb8e2595d38736763c55f0cd46a3f3cd1e (patch)
tree01cd15c520f99b5686ace5a5fe393976f0a1d475 /testsuites/samples/base_mp
parenttestsuite/irhealstone: Merged nested Makefile.am files into one Makefile.am (diff)
downloadrtems-d027e6bb8e2595d38736763c55f0cd46a3f3cd1e.tar.bz2
testsuite/samples: Merged nested Makefile.am files into one Makefile.am
This change is part of the testsuite Makefile.am reorganization. Update #3382
Diffstat (limited to '')
-rw-r--r--testsuites/samples/base_mp/Makefile.am5
-rw-r--r--testsuites/samples/base_mp/base_mp-node1.doc (renamed from testsuites/samples/base_mp/node1/base_mp-node1.doc)0
-rw-r--r--testsuites/samples/base_mp/base_mp-node1.scn (renamed from testsuites/samples/base_mp/node1/base_mp-node1.scn)0
-rw-r--r--testsuites/samples/base_mp/base_mp-node2.doc (renamed from testsuites/samples/base_mp/node2/base_mp-node2.doc)0
-rw-r--r--testsuites/samples/base_mp/base_mp-node2.scn (renamed from testsuites/samples/base_mp/node2/base_mp-node2.scn)0
-rw-r--r--testsuites/samples/base_mp/node1/Makefile.am21
-rw-r--r--testsuites/samples/base_mp/node2/Makefile.am21
7 files changed, 0 insertions, 47 deletions
diff --git a/testsuites/samples/base_mp/Makefile.am b/testsuites/samples/base_mp/Makefile.am
deleted file mode 100644
index 1815b4179c..0000000000
--- a/testsuites/samples/base_mp/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = node1 node2
-
-include $(top_srcdir)/../automake/subdirs.am
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/base_mp/node1/base_mp-node1.doc b/testsuites/samples/base_mp/base_mp-node1.doc
index 981286480f..981286480f 100644
--- a/testsuites/samples/base_mp/node1/base_mp-node1.doc
+++ b/testsuites/samples/base_mp/base_mp-node1.doc
diff --git a/testsuites/samples/base_mp/node1/base_mp-node1.scn b/testsuites/samples/base_mp/base_mp-node1.scn
index a2d2f359be..a2d2f359be 100644
--- a/testsuites/samples/base_mp/node1/base_mp-node1.scn
+++ b/testsuites/samples/base_mp/base_mp-node1.scn
diff --git a/testsuites/samples/base_mp/node2/base_mp-node2.doc b/testsuites/samples/base_mp/base_mp-node2.doc
index 981286480f..981286480f 100644
--- a/testsuites/samples/base_mp/node2/base_mp-node2.doc
+++ b/testsuites/samples/base_mp/base_mp-node2.doc
diff --git a/testsuites/samples/base_mp/node2/base_mp-node2.scn b/testsuites/samples/base_mp/base_mp-node2.scn
index 95bc96a808..95bc96a808 100644
--- a/testsuites/samples/base_mp/node2/base_mp-node2.scn
+++ b/testsuites/samples/base_mp/base_mp-node2.scn
diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
deleted file mode 100644
index 0d58622164..0000000000
--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-rtems_tests_PROGRAMS = base_mp-node1
-base_mp_node1_SOURCES = ../init.c ../apptask.c ../system.h
-
-dist_rtems_tests_DATA = base_mp-node1.scn
-dist_rtems_tests_DATA += base_mp-node1.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -DNODE_NUMBER=1 -I.
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(base_mp_node1_OBJECTS)
-LINK_LIBS = $(base_mp_node1_LDLIBS)
-
-base_mp-node1$(EXEEXT): $(base_mp_node1_OBJECTS) $(base_mp_node1_DEPENDENCIES)
- @rm -f base_mp-node1$(EXEEXT)
- $(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
deleted file mode 100644
index d8471d7ffd..0000000000
--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-rtems_tests_PROGRAMS = base_mp-node2
-base_mp_node2_SOURCES = ../init.c ../apptask.c ../system.h
-
-dist_rtems_tests_DATA = base_mp-node2.scn
-dist_rtems_tests_DATA += base_mp-node2.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -DNODE_NUMBER=2 -I.
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(base_mp_node2_OBJECTS)
-LINK_LIBS = $(base_mp_node2_LDLIBS)
-
-base_mp-node2$(EXEEXT): $(base_mp_node2_OBJECTS) $(base_mp_node2_DEPENDENCIES)
- @rm -f base_mp-node2$(EXEEXT)
- $(make-exe)
-
-include $(top_srcdir)/../automake/local.am