Eliminate scndir, docdir. Use rtems_testsdir instead.

2006-07-11 04:41:36 +00:00
parent 488c3ce716
commit 371fe95f67
9 changed files with 18 additions and 36 deletions
--- a/testsuites/itrontests/itronhello/Makefile.am
+++ b/testsuites/itrontests/itronhello/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = all
 rtems_tests_PROGRAMS = itronhello.exe
 itronhello_exe_SOURCES = init.c system.h

-scndir = $(rtems_testsdir)
-dist_scn_DATA = itronhello.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = itronhello.doc
+dist_rtems_tests_DATA = itronhello.scn
+dist_rtems_tests_DATA += itronhello.doc

 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
--- a/testsuites/itrontests/itronmbf01/Makefile.am
+++ b/testsuites/itrontests/itronmbf01/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = all
 rtems_tests_PROGRAMS = itronmbf01.exe
 itronmbf01_exe_SOURCES = init.c system.h

-scndir = $(rtems_testsdir)
-dist_scn_DATA = itronmbf01.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = itronmbf01.doc
+dist_rtems_tests_DATA = itronmbf01.scn
+dist_rtems_tests_DATA += itronmbf01.doc

 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
--- a/testsuites/itrontests/itronmbox01/Makefile.am
+++ b/testsuites/itrontests/itronmbox01/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = all
 rtems_tests_PROGRAMS = itronmbox01.exe
 itronmbox01_exe_SOURCES = init.c system.h

-scndir = $(rtems_testsdir)
-dist_scn_DATA = itronmbox01.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = itronmbox01.doc
+dist_rtems_tests_DATA = itronmbox01.scn
+dist_rtems_tests_DATA += itronmbox01.doc

 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
--- a/testsuites/itrontests/itronsem01/Makefile.am
+++ b/testsuites/itrontests/itronsem01/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = all
 rtems_tests_PROGRAMS = itronsem01.exe
 itronsem01_exe_SOURCES = init.c system.h

-scndir = $(rtems_testsdir)
-dist_scn_DATA = itronsem01.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = itronsem01.doc
+dist_rtems_tests_DATA = itronsem01.scn
+dist_rtems_tests_DATA += itronsem01.doc

 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
--- a/testsuites/itrontests/itrontask01/Makefile.am
+++ b/testsuites/itrontests/itrontask01/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = all
 rtems_tests_PROGRAMS = itrontask01.exe
 itrontask01_exe_SOURCES = init.c task1.c system.h

-scndir = $(rtems_testsdir)
-dist_scn_DATA = itrontask01.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = itrontask01.doc
+dist_rtems_tests_DATA = itrontask01.scn
+dist_rtems_tests_DATA += itrontask01.doc

 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
--- a/testsuites/itrontests/itrontask02/Makefile.am
+++ b/testsuites/itrontests/itrontask02/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = all
 rtems_tests_PROGRAMS = itrontask02.exe
 itrontask02_exe_SOURCES = init.c dormant.c system.h

-scndir = $(rtems_testsdir)
-dist_scn_DATA = itrontask02.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = itrontask02.doc
+dist_rtems_tests_DATA = itrontask02.scn
+dist_rtems_tests_DATA += itrontask02.doc

 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
--- a/testsuites/itrontests/itrontask03/Makefile.am
+++ b/testsuites/itrontests/itrontask03/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = all
 rtems_tests_PROGRAMS = itrontask03.exe
 itrontask03_exe_SOURCES = init.c preempt.c task1.c task2.c task3.c system.h

-scndir = $(rtems_testsdir)
-dist_scn_DATA = itrontask03.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = itrontask03.doc
+dist_rtems_tests_DATA = itrontask03.scn
+dist_rtems_tests_DATA += itrontask03.doc

 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
--- a/testsuites/itrontests/itrontask04/Makefile.am
+++ b/testsuites/itrontests/itrontask04/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = all
 rtems_tests_PROGRAMS = itrontask04.exe
 itrontask04_exe_SOURCES = init.c task1.c task2.c task3.c system.h

-scndir = $(rtems_testsdir)
-dist_scn_DATA = itrontask04.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = itrontask04.doc
+dist_rtems_tests_DATA = itrontask04.scn
+dist_rtems_tests_DATA += itrontask04.doc

 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
--- a/testsuites/itrontests/itrontime01/Makefile.am
+++ b/testsuites/itrontests/itrontime01/Makefile.am
@@ -7,10 +7,8 @@ MANAGERS = all
 rtems_tests_PROGRAMS = itrontime01.exe
 itrontime01_exe_SOURCES = init.c system.h

-scndir = $(rtems_testsdir)
-dist_scn_DATA = itrontime01.scn
-docdir = $(rtems_testsdir)
-dist_doc_DATA = itrontime01.doc
+dist_rtems_tests_DATA = itrontime01.scn
+dist_rtems_tests_DATA += itrontime01.doc

 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am