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/libtests/cpuuse/Makefile.am | 3 +-- testsuites/libtests/malloctest/Makefile.am | 3 +-- testsuites/libtests/rtems++/Makefile.am | 6 ++---- testsuites/libtests/rtmonuse/Makefile.am | 3 +-- testsuites/libtests/stackchk/Makefile.am | 3 +-- 5 files changed, 6 insertions(+), 12 deletions(-) (limited to 'testsuites/libtests') diff --git a/testsuites/libtests/cpuuse/Makefile.am b/testsuites/libtests/cpuuse/Makefile.am index 1b9a9475d2..9ec0ba0210 100644 --- a/testsuites/libtests/cpuuse/Makefile.am +++ b/testsuites/libtests/cpuuse/Makefile.am @@ -7,8 +7,7 @@ MANAGERS = io rate_monotonic rtems_tests_PROGRAMS = cpuuse.exe cpuuse_exe_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h -scndir = $(rtems_testsdir) -dist_scn_DATA = cpuuse.scn +dist_rtems_tests_DATA = cpuuse.scn include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am diff --git a/testsuites/libtests/malloctest/Makefile.am b/testsuites/libtests/malloctest/Makefile.am index 40c93908f2..8dee7770d6 100644 --- a/testsuites/libtests/malloctest/Makefile.am +++ b/testsuites/libtests/malloctest/Makefile.am @@ -7,8 +7,7 @@ MANAGERS = io rtems_tests_PROGRAMS = malloctest.exe malloctest_exe_SOURCES = init.c task1.c system.h -scndir = $(rtems_testsdir) -dist_scn_DATA = malloctest.scn +dist_rtems_tests_DATA = malloctest.scn include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am diff --git a/testsuites/libtests/rtems++/Makefile.am b/testsuites/libtests/rtems++/Makefile.am index 12bd3a835e..71b920cb4e 100644 --- a/testsuites/libtests/rtems++/Makefile.am +++ b/testsuites/libtests/rtems++/Makefile.am @@ -9,10 +9,8 @@ rtems_tests_PROGRAMS = rtems++.exe rtems___exe_SOURCES = Init.cc Task1.cc Task2.cc Task3.cc System.h endif -scndir = $(rtems_testsdir) -dist_scn_DATA = rtems++.scn -docdir = $(rtems_testsdir) -dist_doc_DATA = rtems++.doc +dist_rtems_tests_DATA = rtems++.scn +dist_rtems_tests_DATA += rtems++.doc include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am diff --git a/testsuites/libtests/rtmonuse/Makefile.am b/testsuites/libtests/rtmonuse/Makefile.am index cbb561b3ae..369ae69354 100644 --- a/testsuites/libtests/rtmonuse/Makefile.am +++ b/testsuites/libtests/rtmonuse/Makefile.am @@ -7,8 +7,7 @@ MANAGERS = io rate_monotonic rtems_tests_PROGRAMS = rtmonuse.exe rtmonuse_exe_SOURCES = init.c getall.c task1.c system.h -scndir = $(rtems_testsdir) -dist_scn_DATA = rtmonuse.scn +dist_rtems_tests_DATA = rtmonuse.scn include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am diff --git a/testsuites/libtests/stackchk/Makefile.am b/testsuites/libtests/stackchk/Makefile.am index a260668c91..1631016be4 100644 --- a/testsuites/libtests/stackchk/Makefile.am +++ b/testsuites/libtests/stackchk/Makefile.am @@ -7,8 +7,7 @@ MANAGERS = io rtems_tests_PROGRAMS = stackchk.exe stackchk_exe_SOURCES = blow.c init.c task1.c system.h -scndir = $(rtems_testsdir) -dist_scn_DATA = stackchk.scn +dist_rtems_tests_DATA = stackchk.scn include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am -- cgit v1.2.3