From d4f5ddcb850be96e83991e00d2392ff8b9b76bc7 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 11 Jul 2006 04:54:10 +0000 Subject: Eliminate scndir, docdir. Use rtems_testsdir instead. --- testsuites/samples/base_mp/node1/Makefile.am | 6 ++---- testsuites/samples/base_mp/node2/Makefile.am | 6 ++---- testsuites/samples/base_sp/Makefile.am | 6 ++---- testsuites/samples/cdtest/Makefile.am | 3 +-- testsuites/samples/fileio/Makefile.am | 3 +-- testsuites/samples/hello/Makefile.am | 6 ++---- testsuites/samples/iostream/Makefile.am | 6 ++---- testsuites/samples/loopback/Makefile.am | 3 +-- testsuites/samples/minimum/Makefile.am | 6 ++---- testsuites/samples/paranoia/Makefile.am | 3 +-- testsuites/samples/ticker/Makefile.am | 6 ++---- testsuites/samples/unlimited/Makefile.am | 6 ++---- 12 files changed, 20 insertions(+), 40 deletions(-) (limited to 'testsuites/samples') diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am index 588096a573..d11367d6b5 100644 --- a/testsuites/samples/base_mp/node1/Makefile.am +++ b/testsuites/samples/base_mp/node1/Makefile.am @@ -7,10 +7,8 @@ MANAGERS = io mp rtems_tests_PROGRAMS = base_mp-node1.exe base_mp_node1_exe_SOURCES = ../init.c ../apptask.c ../system.h -scndir = $(rtems_testsdir) -dist_scn_DATA = base_mp-node1.scn -docdir = $(rtems_testsdir) -dist_doc_DATA = base_mp-node1.doc +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 diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am index 474418808d..e184d77292 100644 --- a/testsuites/samples/base_mp/node2/Makefile.am +++ b/testsuites/samples/base_mp/node2/Makefile.am @@ -7,10 +7,8 @@ MANAGERS = io mp rtems_tests_PROGRAMS = base_mp-node2.exe base_mp_node2_exe_SOURCES = ../init.c ../apptask.c ../system.h -scndir = $(rtems_testsdir) -dist_scn_DATA = base_mp-node2.scn -docdir = $(rtems_testsdir) -dist_doc_DATA = base_mp-node2.doc +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 diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am index 6974a9ee5a..7b2d9d5d69 100644 --- a/testsuites/samples/base_sp/Makefile.am +++ b/testsuites/samples/base_sp/Makefile.am @@ -7,10 +7,8 @@ MANAGERS = io rtems_tests_PROGRAMS = base_sp.exe base_sp_exe_SOURCES = init.c apptask.c system.h -scndir = $(rtems_testsdir) -dist_scn_DATA = base_sp.scn -docdir = $(rtems_testsdir) -dist_doc_DATA = base_sp.doc +dist_rtems_tests_DATA = base_sp.scn +dist_rtems_tests_DATA += base_sp.doc include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am index 7026827972..598a12c1ff 100644 --- a/testsuites/samples/cdtest/Makefile.am +++ b/testsuites/samples/cdtest/Makefile.am @@ -7,8 +7,7 @@ MANAGERS = all rtems_tests_PROGRAMS = cdtest.exe cdtest_exe_SOURCES = init.c main.cc system.h -scndir = $(rtems_testsdir) -dist_scn_DATA = cdtest.scn +dist_rtems_tests_DATA = cdtest.scn include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am index ecaaaa570f..71e2805c77 100644 --- a/testsuites/samples/fileio/Makefile.am +++ b/testsuites/samples/fileio/Makefile.am @@ -9,8 +9,7 @@ if LIBCHIP rtems_tests_PROGRAMS = fileio.exe fileio_exe_SOURCES = init.c system.h -docdir = $(rtems_testsdir) -dist_doc_DATA = fileio.doc +dist_rtems_tests_DATA = fileio.doc endif include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am index 200c3e08a8..883d6856ee 100644 --- a/testsuites/samples/hello/Makefile.am +++ b/testsuites/samples/hello/Makefile.am @@ -7,10 +7,8 @@ MANAGERS = io rtems_tests_PROGRAMS = hello.exe hello_exe_SOURCES = init.c system.h -scndir = $(rtems_testsdir) -dist_scn_DATA = hello.scn -docdir = $(rtems_testsdir) -dist_doc_DATA = hello.doc +dist_rtems_tests_DATA = hello.scn +dist_rtems_tests_DATA += hello.doc include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am index 0688c559d4..a2020fc702 100644 --- a/testsuites/samples/iostream/Makefile.am +++ b/testsuites/samples/iostream/Makefile.am @@ -7,10 +7,8 @@ MANAGERS = io rtems_tests_PROGRAMS = iostream.exe iostream_exe_SOURCES = init.cc system.h -scndir = $(rtems_testsdir) -dist_scn_DATA = iostream.scn -docdir = $(rtems_testsdir) -dist_doc_DATA = iostream.doc +dist_rtems_tests_DATA = iostream.scn +dist_rtems_tests_DATA += iostream.doc include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am index 1cd69f6504..a03ddc85d0 100644 --- a/testsuites/samples/loopback/Makefile.am +++ b/testsuites/samples/loopback/Makefile.am @@ -7,8 +7,7 @@ MANAGERS = io event rtems_tests_PROGRAMS = loopback.exe loopback_exe_SOURCES = init.c -scndir = $(rtems_testsdir) -dist_scn_DATA = loopback.scn +dist_rtems_tests_DATA = loopback.scn include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am index e321b15028..7275dedbdd 100644 --- a/testsuites/samples/minimum/Makefile.am +++ b/testsuites/samples/minimum/Makefile.am @@ -7,10 +7,8 @@ MANAGERS = all rtems_tests_PROGRAMS = minimum.exe minimum_exe_SOURCES = init.c -scndir = $(rtems_testsdir) -dist_scn_DATA = minimum.scn -docdir = $(rtems_testsdir) -dist_doc_DATA = minimum.doc +dist_rtems_tests_DATA = minimum.scn +dist_rtems_tests_DATA += minimum.doc include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am index ca23ff87ea..f8858747c7 100644 --- a/testsuites/samples/paranoia/Makefile.am +++ b/testsuites/samples/paranoia/Makefile.am @@ -7,8 +7,7 @@ MANAGERS = all rtems_tests_PROGRAMS = paranoia.exe paranoia_exe_SOURCES = init.c paranoia.c system.h -docdir = $(rtems_testsdir) -dist_doc_DATA = paranoia.doc +dist_rtems_tests_DATA = paranoia.doc include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am index 4676da5113..b501e6ad34 100644 --- a/testsuites/samples/ticker/Makefile.am +++ b/testsuites/samples/ticker/Makefile.am @@ -7,10 +7,8 @@ MANAGERS = io rtems_tests_PROGRAMS = ticker.exe ticker_exe_SOURCES = init.c tasks.c system.h -scndir = $(rtems_testsdir) -dist_scn_DATA = ticker.scn -docdir = $(rtems_testsdir) -dist_doc_DATA = ticker.doc +dist_rtems_tests_DATA = ticker.scn +dist_rtems_tests_DATA += ticker.doc include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am index 0c512a634e..55d0b42d86 100644 --- a/testsuites/samples/unlimited/Makefile.am +++ b/testsuites/samples/unlimited/Makefile.am @@ -7,10 +7,8 @@ MANAGERS = io event rtems_tests_PROGRAMS = unlimited.exe unlimited_exe_SOURCES = init.c test1.c test2.c test3.c system.h -scndir = $(rtems_testsdir) -dist_scn_DATA = unlimited.scn -docdir = $(rtems_testsdir) -dist_doc_DATA = unlimited.doc +dist_rtems_tests_DATA = unlimited.scn +dist_rtems_tests_DATA += unlimited.doc include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am -- cgit v1.2.3